Re: How is working on arbitrary remote heads supposed to work in Cogito (+ PATCH)?
- From
Petr Baudis <pasky@suse.cz>
- Date
- Jul 29, 2005, 12:28 UTC
- Message-ID
- <20050729122844.GA21909@pasky.ji.cz>
- In-Reply-To
- <Pine.LNX.4.58.0507291424070.6247@wgmdd8.biozentrum.uni-wuerzburg.de>
Dear diary, on Fri, Jul 29, 2005 at 02:26:51PM CEST, I got a letter where Johannes Schindelin <Johannes.Schindelin@gmx.de> told me that...
Show 17 quoted lines
> 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 <Johannes.Schindelin@gmx.de> 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