summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-05 19:37:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-05 19:37:40 (GMT)
commitc39e9eb3df18c34330d50ebfae28b42880d9a4cc (patch)
treee401088b387f87c81127c707e381d61176905226 /Documentation
parentf621a8454d19d17fe46e6951b7e3d22bebd92aba (diff)
parentf0df1293acdba9513cae17e2c63b4169f1347371 (diff)
downloadgit-c39e9eb3df18c34330d50ebfae28b42880d9a4cc.zip
git-c39e9eb3df18c34330d50ebfae28b42880d9a4cc.tar.gz
git-c39e9eb3df18c34330d50ebfae28b42880d9a4cc.tar.bz2
Merge branch 'maint'
* maint: gitweb/README: Document $base_url Documentation: git submodule: add missing options to synopsis Better usage string for reflog. hg-to-git: don't import the unused popen2 module send-email: remove debug trace config: Keep inner whitespace verbatim
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-submodule.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 683ba1a..7dd73ae 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -14,8 +14,8 @@ SYNOPSIS
'git submodule' [--quiet] status [--cached] [--] [<path>...]
'git submodule' [--quiet] init [--] [<path>...]
'git submodule' [--quiet] update [--init] [-N|--no-fetch] [--rebase]
- [--reference <repository>] [--] [<path>...]
-'git submodule' [--quiet] summary [--summary-limit <n>] [commit] [--] [<path>...]
+ [--reference <repository>] [--merge] [--] [<path>...]
+'git submodule' [--quiet] summary [--cached] [--summary-limit <n>] [commit] [--] [<path>...]
'git submodule' [--quiet] foreach <command>
'git submodule' [--quiet] sync [--] [<path>...]