"Michael S. Tsirkin" <mst@xxxxxxxxxxxxxx> writes:
> $ git pull origin
>
> where origin is a file in .git/remotes/origin with multiple Pull: lines,
> then I seem to get an octopus merge.
You shouldn't.
I have four Pull: lines like these for .git/remotes/ko
URL: kernel.org:/pub/scm/git/git.git/
Pull: master:refs/tags/ko-master
Pull: next:refs/tags/ko-next
Pull: +pu:refs/tags/ko-pu
Pull: maint:refs/tags/ko-maint
Push: heads/master
Push: heads/next
Push: +heads/pu
Push: heads/maint
and "git pull ko" leaves this in .git/FETCH_HEAD:
460c... branch 'master' of .kernel.org:/pub/scm/git/git
767f... not-for-merge branch 'next' of .kernel.org:/pub/scm/git/git
9bd4... not-for-merge branch 'pu' of .kernel.org:/pub/scm/git/git
9a1a... not-for-merge branch 'maint' of .kernel.org:/pub/scm/git/git
The latter three are not merged into the current branch with the
above pull command.
Are you by any chance running a version of git that has some
unofficial patches that affect the generation of not-for-merge
markers?
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html