Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com> --- Documentation/config.txt | 13 +------------ Documentation/rerere-config.txt | 12 ++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 Documentation/rerere-config.txt
diff --git a/Documentation/config.txt b/Documentation/config.txt index c3618b00a4..f42b69f3b0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -650,18 +650,7 @@ include::remotes-config.txt[] include::repack-config.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::rerere-config.txt[] include::sendemail-config.txt[] diff --git a/Documentation/rerere-config.txt b/Documentation/rerere-config.txt new file mode 100644 index 0000000000..40abdf6a6b --- /dev/null +++ b/Documentation/rerere-config.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. -- 2.19.1.647.g708186aaf9
