diff options
| author | Rohit Ashiwal <rohit.ashiwal265@gmail.com> | 2019-07-02 09:11:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-02 19:08:07 (GMT) |
| commit | 6a1f9046a40ad69eb00e5a83c6825972113f6e0f (patch) | |
| tree | b644c984dbca974f666a8c57745f04d6b147d80d /column.h | |
| parent | a6a95cd1b46e48e5fe06bdbb0839a67ebeef4682 (diff) | |
| download | git-6a1f9046a40ad69eb00e5a83c6825972113f6e0f.zip git-6a1f9046a40ad69eb00e5a83c6825972113f6e0f.tar.gz git-6a1f9046a40ad69eb00e5a83c6825972113f6e0f.tar.bz2 | |
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 'column.h')
0 files changed, 0 insertions, 0 deletions