org/kernel/git.git - forked from git/git

	Commit message (Collapse)	Author	Age
*	Fix default pull not to do an unintended Octopus.	Junio C Hamano	2005-09-28
\| \| \| \| \| \| \| \| \| \| \| \|	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>
*	Prettyprint octopus merge message.	Junio C Hamano	2005-09-22
	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>