path: root/Documentation
diff options
authorJunio C Hamano <>2008-04-13 02:17:51 (GMT)
committerJunio C Hamano <>2008-04-13 02:17:51 (GMT)
commitf43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f (patch)
treeb29df95a9ea15dc54263921f63077c62058d6c22 /Documentation
parenta53f2ec617ba36a67bf8794d28d666d45ce374a6 (diff)
parent02604e293a3b7d48b0ce4e34149de8dc89c674e5 (diff)
Merge branch 'maint'
* maint: t7401: squelch garbage output Documentation/git-submodule: typofix Fix config key miscount in url.*.insteadOf Docs gitk: Explicitly mention the files that gitk uses (~/.gitk) Document -w option to shortlog bisect: report bad rev better
Diffstat (limited to 'Documentation')
3 files changed, 14 insertions, 3 deletions
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index c775257..d7cb4c0 100644
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -8,8 +8,8 @@ git-shortlog - Summarize 'git log' output
-git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] [-e]
-git-shortlog [-n|--numbered] [-s|--summary] [-e|--email] [<committish>...]
+git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] [-e] [-w]
+git-shortlog [-n|--numbered] [-s|--summary] [-e|--email] [-w[<width>[,<indent1>[,<indent2>]]]] [<committish>...]
@@ -35,6 +35,12 @@ OPTIONS
-e, \--email::
Show the email address of each author.
+ Linewrap the output by wrapping each line at `width`. The first
+ line of each entry is indented by `indent1` spaces, and the second
+ and subsequent lines are indented by `indent2` spaces. `width`,
+ `indent1`, and `indent2` default to 76, 6 and 9 respectively.
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 41f9f63..6ffd896 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -70,7 +70,7 @@ OPTIONS
-n, --summary-limit::
This option is only valid for the summary command.
Limit the summary size (number of commits shown in total).
- Giving 0 will disable the summary; a negative number means unlimted
+ Giving 0 will disable the summary; a negative number means unlimited
(the default). This limit only applies to modified submodules. The
size is always limited to 1 for added/deleted/typechanged submodules.
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 29edafc..ed3ba83 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -74,6 +74,11 @@ gitk --max-count=100 --all \-- Makefile::
Show at most 100 changes made to the file 'Makefile'. Instead of only
looking for changes in the current branch look in all branches.
+Gitk creates the .gitk file in your $HOME directory to store preferences
+such as display options, font, and colors.
See Also