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>
Nguyễn Thái Ngọc Duy committed
Oct 27, 2018 at 08:23 UTC
72622c24867625b417f339ccc45c8700873f6c8a
2 files changed
+13
-12
Documentation/config.txt
+1
-12
@@ -399,18 +399,7 @@ include::config/remotes.txt[]
399
400
include::config/repack.txt[]
401
402
-rerere.autoUpdate::
403
- When set to true, `git-rerere` updates the index with the
404
- resulting contents after it cleanly resolves conflicts using
405
- previously recorded resolution. Defaults to false.
406
-
407
-rerere.enabled::
408
- Activate recording of resolved conflicts, so that identical
409
- conflict hunks can be resolved automatically, should they be
410
- encountered again. By default, linkgit:git-rerere[1] is
411
- enabled if there is an `rr-cache` directory under the
412
- `$GIT_DIR`, e.g. if "rerere" was previously used in the
413
- repository.
402
+include::config/rerere.txt[]
403
404
reset.quiet::
405
When set to true, 'git reset' will default to the '--quiet' option.
Documentation/config/rerere.txt
new
+12
@@ -0,0 +1,12 @@
1
+rerere.autoUpdate::
2
+ When set to true, `git-rerere` updates the index with the
3
+ resulting contents after it cleanly resolves conflicts using
4
+ previously recorded resolution. Defaults to false.
5
+
6
+rerere.enabled::
7
+ Activate recording of resolved conflicts, so that identical
8
+ conflict hunks can be resolved automatically, should they be
9
+ encountered again. By default, linkgit:git-rerere[1] is
10
+ enabled if there is an `rr-cache` directory under the
11
+ `$GIT_DIR`, e.g. if "rerere" was previously used in the
12
+ repository.