From: Mike Hommey <mh@glandium.org>
To: Jakub Narebski <jnareb@gmail.com>
Cc: Robin Rosenberg <robin.rosenberg.lists@dewire.com>,
Junio C Hamano <gitster@pobox.com>,
Stephen Sinclair <radarsat1@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH (repost)] Improve bash prompt to detect merge / rebase in progress
Date: Thu, 7 Feb 2008 00:44:48 +0100 [thread overview]
Message-ID: <20080206234448.GA18269@glandium.org> (raw)
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
next prev parent reply other threads:[~2008-02-06 23:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-06 19:52 command prompt script for current branch Stephen Sinclair
2008-02-06 20:42 ` Junio C Hamano
2008-02-06 22:14 ` [PATCH (repost)] Improve bash prompt to detect merge / rebase in progress Robin Rosenberg
2008-02-06 22:23 ` Robin Rosenberg
2008-02-06 22:31 ` Junio C Hamano
2008-02-07 0:23 ` Robin Rosenberg
2008-02-07 6:34 ` Shawn O. Pearce
2008-02-08 11:26 ` Steffen Prohaska
2008-02-08 12:25 ` Johannes Schindelin
2008-02-08 13:12 ` Steffen Prohaska
2008-02-08 14:06 ` [PATCH/RFC] Make git-completion.bash a first-class citizen Johannes Schindelin
2008-02-06 23:21 ` [PATCH (repost)] Improve bash prompt to detect merge / rebase in progress Jakub Narebski
2008-02-06 23:44 ` Mike Hommey [this message]
2008-02-06 21:09 ` command prompt script for current branch Jakub Narebski
2008-02-06 22:13 ` Stephen Sinclair
2008-02-06 22:56 ` Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080206234448.GA18269@glandium.org \
--to=mh@glandium.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=radarsat1@gmail.com \
--cc=robin.rosenberg.lists@dewire.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).