| commit | e75201963f6722ad84491c8f17dff8406ec0a198 | |
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Sun, 30 Sep 2007 00:20:45 +0000 (30 02:20 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Feb 2008 06:47:36 +0000 (6 22:47 -0800) | ||
| tree | c3d3e33a668ef05873789bcd1239c5ddf8c26383 | treesnapshot (tar.gz zip) |
| parent | b828fef678c21d017f18d2094bfdaac94e5fbf7a | commitdiff |
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>
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>
| contrib/completion/git-completion.bash | diffblobblamehistory |