bash: teach __git_ps1 about CHERRY_PICK_HEAD
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 <jaysoffian@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jay Soffian committed
Feb 19, 2011 at 23:12 UTC
5b2af8cac9883ab7e666d4aa30ea7fd3d1f1d4de
1 file changed
+2
contrib/completion/git-completion.bash
+2
@@ -246,6 +246,8 @@ __git_ps1 ()
246
fi
247
elif [ -f "$g/MERGE_HEAD" ]; then
248
r="|MERGING"
249
+ elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
250
+ r="|CHERRY-PICKING"
251
elif [ -f "$g/BISECT_LOG" ]; then
252
r="|BISECTING"
253
fi