diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-27 11:52:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-27 11:52:51 -0800 |
| commit | 36cd2cc7d949e1cc39104307fe904c47fe6d5526 (patch) | |
| tree | 30d90306e751fbb21f6fc3de98ba31f73b9bcec6 | |
| parent | e9add360074068eac974c5a69f91ae78a30606e9 (diff) | |
| download | git-36cd2cc7d949e1cc39104307fe904c47fe6d5526.tar.gz git-36cd2cc7d949e1cc39104307fe904c47fe6d5526.tar.xz | |
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>
| -rwxr-xr-x | git-fetch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-fetch.sh b/git-fetch.sh index 767ca61ca..125bcea1b 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -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. |