git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH (repost)] Improve bash prompt to detect merge / rebase in progress

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 6, 2008, 22:31 UTC
Message-ID
<7vodatu37m.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<200802062314.39440.robin.rosenberg.lists@dewire.com>
Robin Rosenberg <robin.rosenberg.lists@dewire.com> writes:
> I'm not sure whether you didn't like it or not or just lost it. Here
> is the vastly enhanced prompt again, rebased.
Most likely "lost", and I appreciate a reminder like this.
Show 10 quoted lines
> From 76aa8bae8491c1ffbd6e3f5c99ab014ef87794c8 Mon Sep 17 00:00:00 2001
> From: Shawn O. Pearce <spearce@spearce.org>
> Date: Tue, 4 Sep 2007 03:13:01 -0400
> Subject: 
>
> 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.
>
> Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>

But this looks funny, without Subject: and also S-o-b by the original author (if Shawn is indeed the original author). It appears that the patch originally was from Shawn and after discussion petered out around Oct 1st 2007 there wasn't a resend for inclusion. Is this improved/revised in any way from the one in the thread?

http://thread.gmane.org/gmane.comp.version-control.git/57271/focus=57536
Previous: Robin RosenbergNext: Robin Rosenberg
Message 5 of 16 in “command prompt script for current branch”
  1. Stephen SinclairFeb 6, 2008
  2. Junio C HamanoFeb 6, 2008
  3. Improve bash prompt to detect merge / rebase in progressRobin Rosenberg, Feb 6, 2008
  4. Robin RosenbergFeb 6, 2008
  5. Junio C HamanoFeb 6, 2008
  6. Robin RosenbergFeb 7, 2008
  7. Shawn O. PearceFeb 7, 2008
  8. Steffen ProhaskaFeb 8, 2008
  9. Johannes SchindelinFeb 8, 2008
  10. Steffen ProhaskaFeb 8, 2008
  11. Make git-completion.bash a first-class citizenJohannes Schindelin, Feb 8, 2008
  12. Jakub NarebskiFeb 6, 2008
  13. Mike HommeyFeb 6, 2008
  14. Jakub NarebskiFeb 6, 2008
  15. Stephen SinclairFeb 6, 2008
  16. Jakub NarebskiFeb 6, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.