Merge branch 'ra/cherry-pick-revert-skip'
[git/git.git] / Documentation / config / advice.txt
index ee85c53..6aaa360 100644 (file)
@@ -68,6 +68,8 @@ advice.*::
        resolveConflict::
                Advice shown by various commands when conflicts
                prevent the operation from being performed.
+       sequencerInUse::
+               Advice shown when a sequencer command is already in progress.
        implicitIdentity::
                Advice on how to set your identity configuration when
                your information is guessed from the system username and