diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2009-11-09 09:04:45 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-11-09 17:08:45 -0800 |
| commit | 20c7e3d5cfcc0834fd5d38200e94d15a103ab271 (patch) | |
| tree | 9581a7806df7476271448389ce881f0bdcd66f9c /Makefile | |
| parent | Show usage string for 'git commit-tree -h' (diff) | |
| download | tgif-20c7e3d5cfcc0834fd5d38200e94d15a103ab271.tar.xz | |
Show usage string for 'git merge-ours -h'
This change is strictly about 'git merge-ours -h' without
any other options and arguments.
This change cannot break compatibility since merge drivers are
always passed '--', among other arguments.
Any usage string for this command is a lie, since it ignored its
arguments until now. Still, it makes sense to let the user know
the expected usage when asked.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions