summaryrefslogtreecommitdiffstats
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorJens Lehmann <Jens.Lehmann@web.de>2009-08-01 20:49:47 +0200
committerJunio C Hamano <gitster@pobox.com>2009-08-05 21:36:38 +0200
commit85738ba3df8ae7e01091b479be7f67383ce250b6 (patch)
tree9f0f4ba4ad3e7f7b07c971303cd94b844daad63a /Documentation/git-merge-one-file.txt
parentGIT 1.6.4 (diff)
downloadgit-85738ba3df8ae7e01091b479be7f67383ce250b6.tar.xz
git-85738ba3df8ae7e01091b479be7f67383ce250b6.zip
Documentation: git submodule: add missing options to synopsis
The option --merge was missing for submodule update and --cached for submodule summary. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions