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>
Junio C Hamano committed
Dec 27, 2005 at 11:52 UTC
36cd2cc7d949e1cc39104307fe904c47fe6d5526
1 file changed
+1
-1
git-fetch.sh
+1
-1
@@ -192,7 +192,7 @@ then
192
sed -e '
193
/\^/d
194
s/^[^ ]* //
195
- s/.*/&:&/')
195
+ s/.*/.&:&/')
196
if test "$#" -gt 1
197
then
198
# remote URL plus explicit refspecs; we need to merge them.