| commit | 20c7e3d5cfcc0834fd5d38200e94d15a103ab271 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Mon, 9 Nov 2009 15:04:45 +0000 (9 09:04 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 10 Nov 2009 01:08:45 +0000 (9 17:08 -0800) | ||
| tree | 9581a7806df7476271448389ce881f0bdcd66f9c | treesnapshot (tar.gz zip) |
| parent | 6e9daeffec0213fa1cee76ad9d899fe492409f46 | commitdiff |
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>
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>
| builtin-merge-ours.c | diffblobblamehistory |