diff options
| author |  Thiago Farina <tfransosi@gmail.com> | 2010-08-30 00:30:22 -0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-03 09:37:10 -0700 |
| commit | e78d01bf4e29ec92b4aa466ea0a49ae4be388ca9 (patch) | |
| tree | f9dc267857e5939b6179cd1b245968eb37ed4f81 /.gitattributes | |
| parent | Prepare for 1.7.2.3 (diff) | |
| download | tgif-e78d01bf4e29ec92b4aa466ea0a49ae4be388ca9.tar.xz | |
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 '.gitattributes')
0 files changed, 0 insertions, 0 deletions