diff options
| author |  Robin Rosenberg <robin.rosenberg@dewire.com> | 2007-09-30 02:20:45 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-02-06 22:47:36 -0800 |
| commit | e75201963f6722ad84491c8f17dff8406ec0a198 (patch) | |
| tree | c3d3e33a668ef05873789bcd1239c5ddf8c26383 /t/t4013/diff.diff-tree_--root_--patch-with-raw_initial | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-e75201963f6722ad84491c8f17dff8406ec0a198.tar.xz | |
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@dewire.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 't/t4013/diff.diff-tree_--root_--patch-with-raw_initial')
0 files changed, 0 insertions, 0 deletions