Skip to content

Commit

Permalink
Do not mark tags fetched via --tags flag as mergeable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Dec 27, 2005
1 parent e9add36 commit 36cd2cc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-fetch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 36cd2cc

Please sign in to comment.