Quoting r. Junio C Hamano <junkio@cox.net>: > Are you by any chance running a version of git that has some > unofficial patches that affect the generation of not-for-merge > markers? No, I just reproduced this on plain 1.4.2. My .git/remotes/origin has: URL: /mswg/git/infiniband/.git Pull: refs/heads/ofed_1_1:refs/heads/ofed_1_1 Pull: refs/heads/cma_branch:refs/heads/cma_branch Pull: refs/heads/linus_master:refs/heads/linus_master Pull: refs/heads/master:refs/heads/master Pull: refs/heads/mst_sdp:refs/heads/mst_sdp Pull: refs/heads/ofed_addons:refs/heads/origin Moving the last line Pull: refs/heads/ofed_addons:refs/heads/origin to be the first, like this Pull: refs/heads/ofed_addons:refs/heads/origin Pull: refs/heads/ofed_1_1:refs/heads/ofed_1_1 Pull: refs/heads/cma_branch:refs/heads/cma_branch Pull: refs/heads/linus_master:refs/heads/linus_master Pull: refs/heads/master:refs/heads/master Pull: refs/heads/mst_sdp:refs/heads/mst_sdp fixes the issue. So it seems git pull behaves differently depending on whether the origin pull line is first or not? -- MST - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Mon Aug 14 17:51:40 2006
This archive was generated by hypermail 2.1.8 : 2006-08-14 17:52:17 EST