![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 26 Sep 2005 05:54:23 +0000 (22:54 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 28 Sep 2005 23:22:00 +0000 (16:22 -0700) | ||
| commit | 05dd8e2ee2ecba1b4ef1dbbde5c81281152604b4 | |
| tree | a47668b32b27c0244faa7a9c186fad14f83c6b07 | tree | snapshot |
| parent | 3e03aaf523331d4f3e92e680f75e6053d1813b64 | commit | diff |
Fix default pull not to do an unintended Octopus.
The refspecs specified in the .git/remotes/<remote> on the "Pull: "
lines are for fetching multiple heads in one go, but most of the time
making an Octopus out of them is not what is wanted. Make git-fetch
leave the marker in .git/FETCH_HEAD file so that later stages can
tell which heads are for merging and which are not.
Tom Prince made me realize how stupid the original behaviour was.
Signed-off-by: Junio C Hamano <junkio@cox.net>
The refspecs specified in the .git/remotes/<remote> on the "Pull: "
lines are for fetching multiple heads in one go, but most of the time
making an Octopus out of them is not what is wanted. Make git-fetch
leave the marker in .git/FETCH_HEAD file so that later stages can
tell which heads are for merging and which are not.
Tom Prince made me realize how stupid the original behaviour was.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-fetch.sh | diff | blob | history | |
| git-fmt-merge-msg.perl | diff | blob | history | |
| git-parse-remote.sh | diff | blob | history | |
| git-pull.sh | diff | blob | history |