[Qt-creator] [Development] [FYI] new git-gpush features, a.k.a. the smart way of pushing to gerrit

Thiago Macieira thiago.macieira at intel.com
Wed Oct 22 17:09:33 CEST 2014


On Wednesday 22 October 2014 14:30:54 Oswald Buddenhagen wrote:
> On Wed, Oct 22, 2014 at 12:57:49PM +0300, Orgad Shaneh wrote:
> > An alternative to constant rebasing of the current branch is using *a
> > separate clone* for pushing. This clone can share objects with the real
> > working clone (via .git/objects/info/alternates), then you can easily git
> > checkout and git cherry-pick the changes you want instead of in-place
> > rebasing.
> 
> yeah, i guess this is user friendly. just very picky about who its
> friends are. ;)

I have a separate clone for pushing for when the script fails, which happens 
when there's a conflict during the rebasing / cherry-picking. But most of the 
time, I don't use that clone.

-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center




More information about the Qt-creator mailing list