projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d7e5c0c) | patch
bash: teach __git_ps1 about CHERRY_PICK_HEAD
authorJay Soffian <jaysoffian@gmail.com>
Sun, 20 Feb 2011 04:12:28 +0000 (23:12 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Feb 2011 06:58:18 +0000 (22:58 -0800)
commit5b2af8cac9883ab7e666d4aa30ea7fd3d1f1d4de
treecd2892392a67bcb31430a3b9aefdd188ea220109tree | snapshot
parentd7e5c0cbfb0421d8a609f1125267dbad73069410commit | diff
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>
contrib/completion/git-completion.bash diff | blob | history
Git—the stupid content tracker