summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorStephan Beyer <s-beyer@gmx.net>2008-06-08 01:36:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-06-08 20:46:38 (GMT)
commitbc47c29ec18164ba1f05600333457cf6f2432856 (patch)
treedab182d9aabbba3f09abf8e83ddd9e5a7e8df1a9 /Documentation/merge-options.txt
parentd1eb35b653ddc1bb3fffde1729a7f10342525049 (diff)
downloadgit-bc47c29ec18164ba1f05600333457cf6f2432856.zip
git-bc47c29ec18164ba1f05600333457cf6f2432856.tar.gz
git-bc47c29ec18164ba1f05600333457cf6f2432856.tar.bz2
git-commit.txt: Add missing long/short options
Also split the "-c or -C <commit>" item into two separate items. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions