From: Jonathan Nieder Date: Wed, 16 Feb 2011 21:55:41 GMT Subject: [PATCH 1.5/2] bash: teach __git_ps1 about CHERRY_PICK_HEAD Message-ID: <20110216215541.GD2615@elie> In-Reply-To: <1297850903-65038-3-git-send-email-jaysoffian@gmail.com> From: Jay Soffian 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 --- > * While we're at it, we update git-completion.bash to be > CHERRY_PICK_HEAD aware. Hmm, it seems I don't like this "while at it". :) 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