| commit | e78d01bf4e29ec92b4aa466ea0a49ae4be388ca9 | |
| author | Thiago Farina <tfransosi@gmail.com> | |
| Mon, 30 Aug 2010 03:30:22 +0000 (30 00:30 -0300) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 3 Sep 2010 16:37:10 +0000 (3 09:37 -0700) | ||
| tree | f9dc267857e5939b6179cd1b245968eb37ed4f81 | treesnapshot (tar.gz zip) |
| parent | 22da742982eeeb95b6fb4cd757509a8c4c2202d8 | commitdiff |
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>
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>
| builtin/merge-recursive.c | diffblobblamehistory |