summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorJay Soffian <jaysoffian@gmail.com>2011-02-20 04:12:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-22 06:58:18 (GMT)
commit5b2af8cac9883ab7e666d4aa30ea7fd3d1f1d4de (patch)
treecd2892392a67bcb31430a3b9aefdd188ea220109 /t/t3507-cherry-pick-conflict.sh
parentd7e5c0cbfb0421d8a609f1125267dbad73069410 (diff)
downloadgit-5b2af8cac9883ab7e666d4aa30ea7fd3d1f1d4de.zip
git-5b2af8cac9883ab7e666d4aa30ea7fd3d1f1d4de.tar.gz
git-5b2af8cac9883ab7e666d4aa30ea7fd3d1f1d4de.tar.bz2
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 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions