Re: [PATCH (repost)] Improve bash prompt to detect merge / rebase in progress
From: Mike Hommey <hidden>
Date: 2016-06-15 22:44:11
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH (repost)] Improve bash prompt to detect merge / rebase in progress · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH (repost)] Improve bash prompt to detect merge / rebase in progress · Robin Rosenberg <hidden>
- 2016-06-15 · Re: [PATCH (repost)] Improve bash prompt to detect merge / rebase in progress · Shawn O. Pearce <hidden>
- 2016-06-15 · Re: [PATCH (repost)] Improve bash prompt to detect merge / rebase in progress · Steffen Prohaska <hidden>
- 2016-06-15 · Re: [PATCH (repost)] Improve bash prompt to detect merge / rebase in progress · Johannes Schindelin <hidden>
On Wed, Feb 06, 2008 at 03:21:40PM -0800, Jakub Narebski wrote:
Robin Rosenberg [off-list ref] writes:quoted
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.[...]quoted
+ if [ -d "$g/../.dotest" ][...]quoted
+ elif [ -f "$g/.dotest-merge/interactive" ][...]quoted
+ 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