Re: [ANNOUNCE] git reintegrate 0.1; manager of integration branches

2013-11-02 Thread John Keeping
On Fri, Nov 01, 2013 at 06:35:39AM -0600, Felipe Contreras wrote: One feature that is missing from git-integration is the ability to parse existing integration branches. Nice - I'd never thought of doing this. It also has support for evil merges, so it should be perfectly usable for git.git

Re: [ANNOUNCE] git reintegrate 0.1; manager of integration branches

2013-11-02 Thread Felipe Contreras
On Sat, Nov 2, 2013 at 5:00 AM, John Keeping j...@keeping.me.uk wrote: On Fri, Nov 01, 2013 at 06:35:39AM -0600, Felipe Contreras wrote: One feature that is missing from git-integration is the ability to parse existing integration branches. Nice - I'd never thought of doing this. I tried to

[ANNOUNCE] git reintegrate 0.1; manager of integration branches

2013-11-01 Thread Felipe Contreras
Hi, git reintegrate is a helper tool to manage integration branches, it has all the options of other known tools. This is a rewrite of John Keeping's git-integration in Ruby, it has essentially the same features and passes all the git-integration tests, but it has other features. One feature