2 commits

Author	SHA1	Message	Date
Junio C Hamano	05dd8e2ee2	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>	2005-09-28 16:22:00 -07:00
Junio C Hamano	c8b48ba476	Prettyprint octopus merge message. ... Including the current branch in the list of heads being merged was not a good idea, so drop it. And shorten the message by grouping branches and tags together to form a single line. Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-09-22 18:09:07 -07:00