diff options
| author |  Rohit Ashiwal <rohit.ashiwal265@gmail.com> | 2019-07-02 14:41:25 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-07-02 12:08:07 -0700 |
| commit | 6a1f9046a40ad69eb00e5a83c6825972113f6e0f (patch) | |
| tree | b644c984dbca974f666a8c57745f04d6b147d80d /Documentation/config | |
| parent | The second batch (diff) | |
| download | tgif-6a1f9046a40ad69eb00e5a83c6825972113f6e0f.tar.xz | |
sequencer: add advice for revert
In the case of merge conflicts, while performing a revert, we are
currently advised to use `git cherry-pick --<sequencer-options>`.
Introduce a separate advice message for `git revert`. Also change
the signature of `create_seq_dir` to handle which advice to display
selectively.
Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/advice.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index ec4f6ae658..1cd9096c98 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -57,6 +57,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 |