From: Jay Soffian Date: Thu, 17 Feb 2011 04:18:43 GMT Subject: [PATCH v3 2/4] bash: teach __git_ps1 about CHERRY_PICK_HEAD Message-ID: <1297916325-89688-3-git-send-email-jaysoffian@gmail.com> In-Reply-To: <1297916325-89688-1-git-send-email-jaysoffian@gmail.com> Make the git prompt (when enabled) show a CHERRY-PICKING indicator when we are in the middle of a conflicted cherry-pick, analogous to the existing MERGING and BISECTING flags. Signed-off-by: Jay Soffian Signed-off-by: Jonathan Nieder --- Split this out into its own patch per http://article.gmane.org/gmane.comp.version-control.git/167009 contrib/completion/git-completion.bash | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 893b771..0b0b913 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -246,6 +246,8 @@ __git_ps1 () fi elif [ -f "$g/MERGE_HEAD" ]; then r="|MERGING" + elif [ -f "$g/CHERRY_PICK_HEAD" ]; then + r="|CHERRY-PICKING" elif [ -f "$g/BISECT_LOG" ]; then r="|BISECTING" fi -- 1.7.4.1.30.g7fe09