From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 02 Sep 2007 00:44:07 GMT
Subject: Re: [PATCH] Improve bash prompt to detect merge / rebase in progress
Message-ID: <20070902004407.GI18160@spearce.org>
In-Reply-To: <Pine.LNX.4.64.0709020133540.28586@racer.site>

Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> On Sat, 1 Sep 2007, Shawn O. Pearce wrote:
> > Junio C Hamano <gitster@pobox.com> wrote:
> > > 
> > > I might be in the middle of resolving a conflicted "git am".
> > 
> > And there's no way to tell the difference either.
> 
> AFAICT git-am creates an "info" file in .dotest/.

But git-rebase without -m and -i is defined as format-patch|am.
So when rebasing it looks identical to git-am.  Hence no way to
tell the difference between the two.

I think post 1.5.3 one of the things we should work on is trying
to better track our current operation state.  Most of that would
be to refactor how we track state in things like rebase/am/merge.
 
-- 
Shawn.