| commit | 36cd2cc7d949e1cc39104307fe904c47fe6d5526 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junkio@cox.net> | Tue Dec 27 11:52:51 2005 -0800 |
| committer | Junio C Hamano <junkio@cox.net> | Tue Dec 27 11:52:51 2005 -0800 |
| tree | 30d90306e751fbb21f6fc3de98ba31f73b9bcec6 | |
| parent | e9add360074068eac974c5a69f91ae78a30606e9 [diff] |
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>
diff --git a/git-fetch.sh b/git-fetch.sh index 767ca61..125bcea 100755 --- a/git-fetch.sh +++ b/git-fetch.sh
@@ -192,7 +192,7 @@ sed -e ' /\^/d s/^[^ ]* // - s/.*/&:&/') + s/.*/.&:&/') if test "$#" -gt 1 then # remote URL plus explicit refspecs; we need to merge them.