Alexandre Julliard wrote: > Junio C Hamano <junkio@xxxxxxx> writes: > >> I would rather say "use 'git branch' to make sure if you are >> ready to merge". Who teaches not to use "git pull"? > > We do that for Wine. The problem is that we recommend using git-rebase > to make it easier for occasional developers to keep a clean history, > and rebase and pull interfere badly. What about proposed (and I think not accepted) merge strategy "rebase" (formerly called "subordinate" or something like that)? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - 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