summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-01-14 10:26:21 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-14 10:47:36 -0800
commit08f19cfe9bff097e8828a289d2daf5f066e1af9d (patch)
tree06a82c4e281b49cc861b1888e52dd360a5ee025a /builtin.h
parentMerge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfix (diff)
downloadtgif-08f19cfe9bff097e8828a289d2daf5f066e1af9d.tar.xz
Documentation: "git pull" does not have the "-m" option
Even though "--[no-]edit" can be used with "git pull", the explanation of the interaction between this option and the "-m" option does not make sense within the context of "git pull". Use the conditional inclusion mechanism to remove this part from "git pull" documentation, while keeping it for "git merge". Reported-by: Ivan Zakharyaschev Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin.h')
0 files changed, 0 insertions, 0 deletions