Open Stack

On 08/04/2014 07:18 PM, Yuriy Taraday wrote:
> Hello, git-review users!
> 
> <snip
> 0. create new local branch;
> 
> master: M--....
>          \
> feature:  *
> 
> 1. start hacking, doing small local meaningful (to you) commits;
> 
> master: M--....
>          \
> feature:  A-B-...-C
> 
> 2. since hacking takes tremendous amount of time (you're doing a Cool
> Feature (tm), nothing less) you need to update some code from master, so
> you're just merging master in to your branch (i.e. using Git as you'd
> use it normally);
> 
> master: M--....-N-O-...
>          \    \    \
> feature:  A-B-...-C-D-...
> 
> 3. and now you get the first version that deserves to be seen by
> community, so you run 'git review', it asks you for desired commit
> message, and <poof, magic-magic> all changes from your branch is
> uploaded to Gerrit as _one_ change request;
> 
> master: M--....-N-O-...
>          \    \    \----E* <= uploaded
> feature:  A-B-...-C-D-...-E
> 
> <snip>

+1, this is definitely a feature I'd want to see.

Currently I run two branches "bug/LPBUG#-local" and "bug/LPBUG#" where
the local is my full history of the change and the other branch is the
squashed version I send out to Gerrit.

Cheers,
-- 
Ryan Brown / Software Engineer, Openstack / Red Hat, Inc.