Thread (3 messages) flat view 3 messages, 2 authors, 2016-06-15

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

From: John Keeping <hidden>
Date: 2016-06-15 22:59:10

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 maintenance.
By this, do you mean that you have an ability to squash a fixup into the
merge?  If so, how do you handle this in the status display - I've had a
WIP branch for a while but haven't come up with a satisfactory way of
displaying the status of a fixup.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help