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 /t/t3417-rebase-whitespace-fix.sh | |
| 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 't/t3417-rebase-whitespace-fix.sh')
0 files changed, 0 insertions, 0 deletions