summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorThiago Farina <tfransosi@gmail.com>2010-08-30 03:30:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-03 16:37:10 (GMT)
commite78d01bf4e29ec92b4aa466ea0a49ae4be388ca9 (patch)
treef9dc267857e5939b6179cd1b245968eb37ed4f81 /Documentation/git.txt
parent22da742982eeeb95b6fb4cd757509a8c4c2202d8 (diff)
downloadgit-e78d01bf4e29ec92b4aa466ea0a49ae4be388ca9.zip
git-e78d01bf4e29ec92b4aa466ea0a49ae4be388ca9.tar.gz
git-e78d01bf4e29ec92b4aa466ea0a49ae4be388ca9.tar.bz2
builtin/merge_recursive.c: Add an usage string and make use of it.
This improves the usage output by adding builtin_merge_recursive_usage string that follows the same pattern used by the other builtin commands. The previous output for git merger-recursive was: usage: merge-recursive <base>... -- <head> <remote> ... Now the output is: usage: git merge-recursive <base>... -- <head> <remote> ... Since cmd_merge_recursive is used to handle four different commands we need the %s in the usage string, so the following example: $ git merge-subtree -h Will output: usage: git merge-subtree <base>... -- <head> <remote> ... Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git.txt')
0 files changed, 0 insertions, 0 deletions