From: Nguyễn Thái Ngọc Duy Date: Sat, 27 Oct 2018 06:23:33 +0000 (+0200) Subject: config.txt: move rerere.* to a separate file X-Git-Tag: v2.20.0-rc0~59^2~18 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/72622c24867625b417f339ccc45c8700873f6c8a config.txt: move rerere.* to a separate file Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index 0ce5081f22..71bab1f3b8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -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. diff --git a/Documentation/config/rerere.txt b/Documentation/config/rerere.txt new file mode 100644 index 0000000000..40abdf6a6b --- /dev/null +++ b/Documentation/config/rerere.txt @@ -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.