summaryrefslogtreecommitdiff
path: root/perl/Makefile.PL
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-03-21 22:57:48 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-21 15:47:38 -0700
commit77c72780edfa5e3858423366fc91699724793b39 (patch)
treea99b3e5cd412ea5ddd2c4119d5c88d49d3dbabec /perl/Makefile.PL
parentGit 1.8.1 (diff)
downloadtgif-77c72780edfa5e3858423366fc91699724793b39.tar.xz
Documentation: merging a tag is a special case
When asking Git to merge a tag (such as a signed tag or annotated tag), it will always create a merge commit even if fast-forward was possible. It's like having --no-ff present on the command line. It's a difference from the default behavior described in git-merge.txt. It should be documented as an exception of "FAST-FORWARD MERGE" section and "--ff" option description. Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Reviewed-by: Yann Droneaud <ydroneaud@opteya.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'perl/Makefile.PL')
0 files changed, 0 insertions, 0 deletions