Skip to content

Commit 30b00f0

Browse files
newrengitster
authored andcommitted
git-prompt: document how in-progress operations affect the prompt
Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 051df3c commit 30b00f0

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

contrib/completion/git-prompt.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@
7070
# state symbols by setting GIT_PS1_STATESEPARATOR. The default separator
7171
# is SP.
7272
#
73+
# When there is an in-progress operation such as a merge, rebase,
74+
# revert, cherry-pick, or bisect, the prompt will include information
75+
# related to the operation, often in the form "|<OPERATION-NAME>".
76+
#
7377
# By default, __git_ps1 will compare HEAD to your SVN upstream if it can
7478
# find one, or @{upstream} otherwise. Once you have set
7579
# GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by

0 commit comments

Comments
 (0)