Alexandre Julliard wrote: > Jakub Narebski <jnareb@xxxxxxxxx> writes: >> 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)? > > That sounds very interesting. Has it ever been implemented, or only > discussed? There was some implementation with warts http://thread.gmane.org/gmane.comp.version-control.git/30068 Message-Id: <20061025155009.GD5591@xxxxxxxxxxxxxxxx> which didn't got corrected and resent. -- Jakub Narebski Poland - 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