Robin Rosenberg <robin.rosenberg.lists@xxxxxxxxxx> wrote: > I sent a patch and Shawn modified it somewhat and posted the full modified > patch. Here is the same patch again (to make sure you get the right one). It > has a better comment than the one I sent recently. > > -- robin > > From 82a5b8d5b043ffc7c1950b391ec7ae69d575640b Mon Sep 17 00:00:00 2001 > From: Robin Rosenberg <robin.rosenberg@xxxxxxxxxx> > Date: Sun, 30 Sep 2007 02:20:45 +0200 > Subject: [PATCH] Improve bash prompt to detect various states like an unfinished merge > > 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. > > An uncompleted git-am cannot be distinguised from a rebase (the > non-interactive version). Instead of having an even longer prompt > we simply ignore that and hope the power users that use git-am knows > the difference. > > Signed-off-by: Robin Rosenberg <robin.rosenberg@xxxxxxxxxx> For what it's worth: Acked-by: Shawn O. Pearce <spearce@xxxxxxxxxxx> -- Shawn. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html