From: Junio C Hamano <junkio@cox.net>
Date: Sun, 3 Dec 2006 00:58:30 +0000 (-0800)
Subject: git-merge: fix confusion between tag and branch
X-Git-Tag: v1.5.0-rc0~174
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3683dc5a9afaf88d00e55c9e6c67a2160ca7fc9c?ds=inline;hp=3683dc5a9afaf88d00e55c9e6c67a2160ca7fc9c

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>
---