summaryrefslogtreecommitdiff
path: root/Documentation/git-submodule.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-04-12 19:17:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-04-12 19:17:51 -0700
commitf43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f (patch)
treeb29df95a9ea15dc54263921f63077c62058d6c22 /Documentation/git-submodule.txt
parentgit_config_bool_or_int() (diff)
parentt7401: squelch garbage output (diff)
downloadtgif-f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f.tar.xz
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/git-submodule.txt')
-rw-r--r--Documentation/git-submodule.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 41f9f63566..6ffd896fbc 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.