Subject: Re: [boost] [O/T git and workflows] A couple of questions
From: Julian Gonggrijp (j.gonggrijp_at_[hidden])
Date: 2012-03-15 08:01:14
Dave Abrahams wrote:
> on Tue Mar 06 2012, Brian Schrom <brian.schrom-AT-pnnl.gov> wrote:
>> git flow (https://github.com/nvie/gitflow) has some nice wrappers
>> for branch management. This looks especially appealing for gently
>> introducing people to git. It provides structure and reduces the number
>> of commands.
> I don't know about that last part ;-). Every additional tool adds more
> commands, and it's not as though the raw git commands go away or even
> become obsolete. But I like git-flow.
Come to speak of it, there is one aspect of the git-flow tool that
annoys me nearly every day. It enforces full merges. So if I want to
do a fast-forward merge after a rebase, I have to run four commands:
$ git flow feature rebase
$ git checkout develop # alias $ git cd
$ git merge feature/featurename
$ git branch -d feature/featurename
instead of just the regular single git-flow command:
$ git flow feature finish -r featurename
# alias $ git fffr featurename
The latter would work too, but it leaves a visible separate branch
and merge in history which is exactly what I was trying to avoid by
doing a rebase before merging. While writing this, I've decided I'll
file a ticket on this to the git-flow team.
If anyone can think of a way to make fast-forward merge on rebase
less kludgy in the meanwhile, I'd be glad to hear about it.
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk