Skip to content
Snippets Groups Projects
Commit 05dd8e2e authored by Junio C Hamano's avatar Junio C Hamano
Browse files

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: default avatarJunio C Hamano <junkio@cox.net>
parent 3e03aaf5
Branches
Tags
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment