summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-09 15:56:17 -0800
committerJunio C Hamano <gitster@pobox.com>2011-03-09 15:56:17 -0800
commit66ecd2d05306fccc65e8d6a5f49100840ea7d3b6 (patch)
tree159eaf1f118e602f3a397ede9dc2b386a96b627a /contrib
parent75618f1106b95defafca698d5cfdfd3dfb3a7e3c (diff)
parent37f7a8579363a98efc48dfb6964a519034fc9acc (diff)
downloadgit-66ecd2d05306fccc65e8d6a5f49100840ea7d3b6.tar.gz
Merge branch 'js/cherry-pick-usability'
* js/cherry-pick-usability: Teach commit about CHERRY_PICK_HEAD bash: teach __git_ps1 about CHERRY_PICK_HEAD Introduce CHERRY_PICK_HEAD t3507: introduce pristine-detach helper
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/completion/git-completion.bash2
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 893b7716ca..0b0b913d28 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