| commit | 77c72780edfa5e3858423366fc91699724793b39 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Mar 2013 21:57:48 +0000 (21 22:57 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Mar 2013 22:47:38 +0000 (21 15:47 -0700) | ||
| tree | a99b3e5cd412ea5ddd2c4119d5c88d49d3dbabec | treesnapshot (tar.gz zip) |
| parent | 5d417842efeafb6e109db7574196901c4e95d273 | commitdiff |
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>
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>
| Documentation/git-merge.txt | diffblobblamehistory | |
| Documentation/merge-options.txt | diffblobblamehistory |