Rohit Ashiwal 6a1f9046a4 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>

2019-07-02 12:08:07 -07:00

..

add.txt

config.txt: move add.* to a separate file

2018-10-29 10:17:00 +09:00

advice.txt

sequencer: add advice for revert

2019-07-02 12:08:07 -07:00

alias.txt

config.txt: move alias.* to a separate file

2018-10-29 10:17:00 +09:00

am.txt

config.txt: move am.* to a separate file

2018-10-29 10:17:00 +09:00

apply.txt

config.txt: move apply.* to a separate file

2018-10-29 10:17:00 +09:00

blame.txt

config.txt: move blame.* to a separate file

2018-10-29 10:17:00 +09:00

branch.txt

rebase: deprecate --preserve-merges

2019-03-12 16:29:00 +09:00

browser.txt

config.txt: move browser.* to a separate file

2018-10-29 10:17:00 +09:00

checkout.txt

config.txt: move checkout.* to a separate file

2018-10-29 10:17:00 +09:00

clean.txt

config.txt: move clean.* to a separate file

2018-10-29 10:17:00 +09:00

color.txt

config.txt: move color.* to a separate file

2018-10-29 10:17:00 +09:00

column.txt

config.txt: move column.* to a separate file

2018-10-29 10:17:00 +09:00

commit.txt

config.txt: move commit.* to a separate file

2018-10-29 10:17:00 +09:00

completion.txt

config.txt: move completion.* to a separate file

2018-10-29 10:17:01 +09:00

core.txt

doc: format pathnames and URLs as monospace.

2019-03-13 11:14:22 +09:00

credential.txt

config.txt: move credential.* to a separate file

2018-10-29 10:17:01 +09:00

diff.txt

Documentation: turn middle-of-line tabs into spaces

2019-03-07 09:25:32 +09:00

difftool.txt

config.txt: move difftool.* to a separate file

2018-10-29 10:17:01 +09:00

fastimport.txt

config.txt: move fastimport.* to a separate file

2018-10-29 10:17:01 +09:00

fetch.txt

config.txt: move fetch-config.txt to config/

2018-10-29 10:17:01 +09:00

filter.txt

config.txt: move filter.* to a separate file

2018-10-29 10:17:01 +09:00

fmt-merge-msg.txt

config.txt: move fmt-merge-msg-config.txt to config/

2018-10-29 10:17:01 +09:00

format.txt

format-patch: teach format.notes config option

2019-05-17 12:51:53 +09:00

fsck.txt

config/fsck.txt: avoid starting line with dash

2019-03-07 09:25:32 +09:00

gc.txt

Merge branch 'ab/gc-docs'

2019-04-25 16:41:18 +09:00

gitcvs.txt

config.txt: move gitcvs-config.txt to config/

2018-10-29 10:17:01 +09:00

gitweb.txt

config.txt: move gitweb.* to a separate file

2018-10-29 10:17:01 +09:00

gpg.txt

Documentation: turn middle-of-line tabs into spaces

2019-03-07 09:25:32 +09:00

grep.txt

config.txt: move grep.* to a separate file

2018-10-29 10:17:01 +09:00

gui.txt

config.txt: move gui-config.txt to config/

2018-10-29 10:17:02 +09:00

guitool.txt

config.txt: move guitool.* to a separate file

2018-10-29 10:17:02 +09:00

help.txt

config.txt: move help.* to a separate file

2018-10-29 10:17:02 +09:00

http.txt

Merge branch 'fc/http-version'

2019-01-04 13:33:32 -08:00

i18n.txt

config.txt: move i18n.* to a separate file

2018-10-29 10:17:02 +09:00

imap.txt

git-imap-send.txt: move imap.* to a separate file

2018-10-29 10:17:02 +09:00

index.txt

index: make index.threads=true enable ieot and eoie

2018-11-21 16:46:54 +09:00

init.txt

config.txt: move init.* to a separate file

2018-10-29 10:17:02 +09:00

instaweb.txt

config.txt: move instaweb.* to a separate file

2018-10-29 10:17:02 +09:00

interactive.txt

config.txt: move interactive.* to a separate file

2018-10-29 10:17:02 +09:00

log.txt

config.txt: move log.* to a separate file

2018-10-29 10:17:02 +09:00

mailinfo.txt

config.txt: move mailinfo.* to a separate file

2018-10-29 10:17:02 +09:00

mailmap.txt

config.txt: move mailmap.* to a separate file

2018-10-29 10:17:03 +09:00

man.txt

config.txt: move man.* to a separate file

2018-10-29 10:17:03 +09:00

merge.txt

merge-recursive: switch directory rename detection default

2019-04-08 16:02:08 +09:00

mergetool.txt

config.txt: move mergetool.* to a separate file

2018-10-29 10:17:03 +09:00

notes.txt

config.txt: move notes.* to a separate file

2018-10-29 10:17:03 +09:00

pack.txt

pack-objects: default to writing bitmap hash-cache

2019-03-18 14:11:15 +09:00

pager.txt

config.txt: move pager.* to a separate file

2018-10-29 10:17:03 +09:00

pretty.txt

config.txt: move pretty.* to a separate file

2018-10-29 10:17:03 +09:00

protocol.txt

config.txt: move protocol.* to a separate file

2018-10-29 10:17:03 +09:00

pull.txt

rebase: deprecate --preserve-merges

2019-03-12 16:29:00 +09:00

push.txt

config.txt: move push-config.txt to config/

2018-10-29 10:17:03 +09:00

rebase.txt

rebase: remove the rebase.useBuiltin setting

2019-03-20 09:25:10 +09:00

receive.txt

config.txt: move receive-config.txt to config/

2018-10-29 10:17:03 +09:00

remote.txt

config.txt: move remote.* to a separate file

2018-10-29 10:17:03 +09:00

remotes.txt

config.txt: move remotes.* to a separate file

2018-10-29 10:17:03 +09:00

repack.txt

repack: enable bitmaps by default on bare repos

2019-03-18 14:09:54 +09:00

rerere.txt

config.txt: move rerere.* to a separate file

2018-10-29 10:17:04 +09:00

reset.txt

config.txt: move reset.* to a separate file

2018-10-29 10:17:04 +09:00

sendemail.txt

config.txt: move sendemail-config.txt to config/

2018-10-29 10:17:04 +09:00

sequencer.txt

config.txt: move sequencer.* to a separate file

2018-10-29 10:17:04 +09:00

showbranch.txt

config.txt: move showBranch.* to a separate file

2018-10-29 10:17:04 +09:00

splitindex.txt

config.txt: move splitIndex.* to a separate file

2018-10-29 10:17:04 +09:00

ssh.txt

config.txt: move ssh.* to a separate file

2018-10-29 10:17:02 +09:00

stash.txt

stash: document stash.useBuiltin

2019-05-15 10:47:20 +09:00

status.txt

config.txt: move status.* to a separate file

2018-10-29 10:17:04 +09:00

submodule.txt

config.txt: move submodule.* to a separate file

2018-10-29 10:17:04 +09:00

tag.txt

config.txt: move tag.* to a separate file

2018-10-29 10:17:04 +09:00

trace2.txt

trace2: rename environment variables to GIT_TRACE2*

2019-05-28 10:20:34 -07:00

transfer.txt

config.txt: move transfer.* to a separate file

2018-10-29 10:17:04 +09:00

uploadarchive.txt

config.txt: move uploadarchive.* to a separate file

2018-10-29 10:17:04 +09:00

uploadpack.txt

config.txt: move uploadpack.* to a separate file

2018-10-29 10:17:04 +09:00

url.txt

config.txt: move url.* to a separate file

2018-10-29 10:17:04 +09:00

user.txt

config: allow giving separate author and committer idents

2019-02-04 12:18:13 -08:00

versionsort.txt

config.txt: move versionsort.* to a separate file

2018-10-29 10:17:05 +09:00

web.txt

config.txt: move web.* to a separate file

2018-10-29 10:17:05 +09:00

worktree.txt

doc/config: do a better job of introducing 'worktree.guessRemote'

2018-12-28 13:27:11 -08:00