mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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:
parent
e9add36007
commit
36cd2cc7d9
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue