summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.h
diff options
context:
space:
mode:
authorLibravatar Miklos Vajna <vmiklos@suse.cz>2012-08-16 11:50:18 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-08-17 00:26:52 -0700
commitd9aa3610437e8cfab86fe3d1e3433400de15773d (patch)
tree032247e7dc548244503f4b6dab8b5d5eb29c3a00 /fmt-merge-msg.h
parentGit 1.7.10.5 (diff)
downloadtgif-d9aa3610437e8cfab86fe3d1e3433400de15773d.tar.xz
man: git pull -r is a short for --rebase
Letting the "--rebase" option squat on the short-and-sweet single letter option "-r" was an unintended accident and was not even documented, but the short option seems to be already used in the wild. Let's document it so that other options that begin with "r" would not be tempted to steal it. Signed-off-by: Miklos Vajna <vmiklos@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fmt-merge-msg.h')
0 files changed, 0 insertions, 0 deletions