diff options
| author | Jay Soffian <jaysoffian@gmail.com> | 2011-02-19 23:12:28 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-21 22:58:18 -0800 |
| commit | 5b2af8cac9883ab7e666d4aa30ea7fd3d1f1d4de (patch) | |
| tree | cd2892392a67bcb31430a3b9aefdd188ea220109 /contrib | |
| parent | d7e5c0cbfb0421d8a609f1125267dbad73069410 (diff) | |
| download | git-5b2af8cac9883ab7e666d4aa30ea7fd3d1f1d4de.tar.gz git-5b2af8cac9883ab7e666d4aa30ea7fd3d1f1d4de.tar.xz | |
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>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | 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 893b7716c..0b0b913d2 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 |