Dear diary, on Fri, Jul 29, 2005 at 02:26:51PM CEST, I got a letter where Johannes Schindelin <[EMAIL PROTECTED]> told me that... > Hi, > > On Fri, 29 Jul 2005, Petr Baudis wrote: > > > Dear diary, on Fri, Jul 29, 2005 at 12:57:50PM CEST, I got a letter > > where Johannes Schindelin <[EMAIL PROTECTED]> told me that... > > > > > git-switch-tree remotehead > > > git-merge master > > > git-push remoteside remotehead > > > > > > which would have the further advantage of documenting what you really did > > > in the history. > > > > How would that document anything normal push wouldn't? > > git-merge?
You have to git-merge anyway if remote head is not your ancestor yet, otherwise the push cannot proceed. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ If you want the holes in your knowledge showing up try teaching someone. -- Alan Cox - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html