Re: Additional plumbing commands

2015-01-07 Thread Junio C Hamano
Jeff King writes: > ... Knowing what each state _means_ > and what operations are meaningful to perform is much trickier (e.g., if > we are in a rebase, you probably do not want to start a new rebase. But > is it wrong to cherry-pick?). > > It would be nice if we could find a way to generalize in

Re: Additional plumbing commands

2015-01-07 Thread Jeff King
On Tue, Jan 06, 2015 at 06:37:34PM +0100, Christian Couder wrote: > On Tue, Jan 6, 2015 at 5:05 PM, Charles Rudolph > wrote: > > I am writing some higher level git commands for > > https://github.com/Originate/git-town and would like some additional > > plumbing c

Re: Additional plumbing commands

2015-01-06 Thread Christian Couder
On Tue, Jan 6, 2015 at 5:05 PM, Charles Rudolph wrote: > I am writing some higher level git commands for > https://github.com/Originate/git-town and would like some additional > plumbing commands that can tell me > > 1. is there a merge in progress? > 2. is there a rebase in

Additional plumbing commands

2015-01-06 Thread Charles Rudolph
I am writing some higher level git commands for https://github.com/Originate/git-town and would like some additional plumbing commands that can tell me 1. is there a merge in progress? 2. is there a rebase in progress? 3. is there a cherry-pick in progress? 4. are there unmerged paths? Currently