| commit | 3683dc5a9afaf88d00e55c9e6c67a2160ca7fc9c | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 3 Dec 2006 00:58:30 +0000 (2 16:58 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 3 Dec 2006 00:58:30 +0000 (2 16:58 -0800) | ||
| tree | 644cbf283f249555f275196515a23479e3c5c223 | treesnapshot (tar.gz zip) |
| parent | 22b1c7ee01ef5bc7f81e620bb88a6fad79c1c605 | commitdiff |
git-merge: fix confusion between tag and branch
In a repository with core.warnambiguousrefs turned off, and with
a branch and a tag that have the same name 'frotz',
git merge frotz
would merge the commit pointed at by the tag 'frotz' but
incorrectly would identify what was merged as 'branch frotz' in
the merge message.
Signed-off-by: Junio C Hamano <junkio@cox.net>
In a repository with core.warnambiguousrefs turned off, and with
a branch and a tag that have the same name 'frotz',
git merge frotz
would merge the commit pointed at by the tag 'frotz' but
incorrectly would identify what was merged as 'branch frotz' in
the merge message.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge.sh | diffblobblamehistory |