mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Nguyễn Thái Ngọc Duy
2018-10-27 08:23:33 +02:00
committed by Junio C Hamano
parent be958be236
commit 72622c2486
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/config.txt
View File

@ -399,18 +399,7 @@ include::config/remotes.txt[]
include::config/repack.txt[] include::config/repack.txt[]
rerere.autoUpdate:: include::config/rerere.txt[]
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.
reset.quiet:: reset.quiet::
When set to true, 'git reset' will default to the '--quiet' option. When set to true, 'git reset' will default to the '--quiet' option.

12
Documentation/config/rerere.txt Normal file
View File

@ -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.