зеркало из https://github.com/microsoft/git.git
config.txt: move rerere.* to a separate file
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
be958be236
Коммит
72622c2486
|
@ -399,18 +399,7 @@ include::config/remotes.txt[]
|
|||
|
||||
include::config/repack.txt[]
|
||||
|
||||
rerere.autoUpdate::
|
||||
When set to true, `git-rerere` updates the index with the
|
||||
resulting contents after it cleanly resolves conflicts using
|
||||
previously recorded resolution. Defaults to false.
|
||||
|
||||
rerere.enabled::
|
||||
Activate recording of resolved conflicts, so that identical
|
||||
conflict hunks can be resolved automatically, should they be
|
||||
encountered again. By default, linkgit:git-rerere[1] is
|
||||
enabled if there is an `rr-cache` directory under the
|
||||
`$GIT_DIR`, e.g. if "rerere" was previously used in the
|
||||
repository.
|
||||
include::config/rerere.txt[]
|
||||
|
||||
reset.quiet::
|
||||
When set to true, 'git reset' will default to the '--quiet' option.
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
rerere.autoUpdate::
|
||||
When set to true, `git-rerere` updates the index with the
|
||||
resulting contents after it cleanly resolves conflicts using
|
||||
previously recorded resolution. Defaults to false.
|
||||
|
||||
rerere.enabled::
|
||||
Activate recording of resolved conflicts, so that identical
|
||||
conflict hunks can be resolved automatically, should they be
|
||||
encountered again. By default, linkgit:git-rerere[1] is
|
||||
enabled if there is an `rr-cache` directory under the
|
||||
`$GIT_DIR`, e.g. if "rerere" was previously used in the
|
||||
repository.
|
Загрузка…
Ссылка в новой задаче