Do not mark tags fetched via --tags flag as mergeable

Otherwise "git pull --tags" would mistakenly try to merge all of
them, which is never what the user wants.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-12-27 11:52:51 -08:00
parent e9add36007
commit 36cd2cc7d9

View File

@ -192,7 +192,7 @@ then
sed -e '
/\^/d
s/^[^ ]* //
s/.*/&:&/')
s/.*/.&:&/')
if test "$#" -gt 1
then
# remote URL plus explicit refspecs; we need to merge them.