summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2011-02-14 17:48:08 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-02-15 10:53:24 -0800
commit24231e063f0f003f8ffd7b64c7ba6a0baaaa5283 (patch)
tree2b2ffbb4c1bb5a3793bee77d673b7abd85366b3d /builtin/merge.c
parentgit-tag.txt: list all modes in the description (diff)
downloadtgif-24231e063f0f003f8ffd7b64c7ba6a0baaaa5283.tar.xz
pull: do not display fetch usage on --help-all
Currently, "git pull --help-all" displays the fetch usage info. Make it equivalent to "git pull -h" instead since "--help-all" is documented in gitcli(7). Do not try to sanitize the pull option parser (aka last hair puller). Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions