Merge branch 'maint'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 893b7716cafa4811d237480a980140d308aa20dc..0b0b913d287f5d70f8f8fdce5f16335dd1c6f9ec 100755 (executable)
--- 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