Jakub Narebski <jnareb@gmail.com> writes: > Alexandre Julliard wrote: > >> Junio C Hamano <junkio@cox.net> 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)? That sounds very interesting. Has it ever been implemented, or only discussed? -- Alexandre Julliard julliard@winehq.org - 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 Sat Nov 18 03:50:12 2006
This archive was generated by hypermail 2.1.8 : 2006-11-18 03:52:29 EST