From: Mike Hommey <mh@glandium.org>
Date: Wed, 06 Feb 2008 23:44:48 GMT
Subject: Re: [PATCH (repost)] Improve bash prompt to detect merge / rebase in progress
Message-ID: <20080206234448.GA18269@glandium.org>
In-Reply-To: <m3myqd4qo2.fsf@localhost.localdomain>

On Wed, Feb 06, 2008 at 03:21:40PM -0800, Jakub Narebski wrote:
> Robin Rosenberg <robin.rosenberg.lists@dewire.com> writes:
> 
> > This patch makes the git prompt (when enabled) show if a merge or a
> > rebase is unfinished. It also detects if a bisect is being done as
> > well as detached checkouts.
> [...]
> > +		if [ -d "$g/../.dotest" ]
> [...]
> > +		elif [ -f "$g/.dotest-merge/interactive" ]
> [...]
> > +		elif [ -d "$g/.dotest-merge" ]
> 
> Hmmm... is it time to ressurect "git explain" / "git info" / "git state"
> command idea, as to not need to harcode info about state in scripts,
> putting it in only one place?

Maybe git status could deal with that job.

Mike