aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-16 11:14:27 -0700
committerJunio C Hamano <gitster@pobox.com>2011-09-16 11:19:43 -0700
commit91a640ffb6d9dd10c293a575a692d9771b6e13c7 (patch)
tree57d7b2bc83a467e8b5b6bdb22de36769b1ef7b98 /builtin/merge-ours.c
parent87b50542a08ac6caa083ddc376e674424e37940a (diff)
downloadgit-91a640ffb6d9dd10c293a575a692d9771b6e13c7.tar.gz
git-91a640ffb6d9dd10c293a575a692d9771b6e13c7.tar.xz
ls-remote: a lone "-h" is asking for help
What should happen if you run this command? $ git ls-remote -h It does not give a short-help for the command. Instead because "-h" is a synonym for "--heads", it runs "git ls-remote --heads", and because there is no remote specified on the command line, we run it against the default "origin" remote, hence end up doing the same as $ git ls-remote --heads origin Fix this counter-intuitive behaviour by special casing a lone "-h" that does not have anything else on the command line and calling usage(). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions