Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
Documentation/blame-config.txt | 21 +++++++++++++++++++++
Documentation/config.txt | 22 +---------------------
2 files changed, 22 insertions(+), 21 deletions(-)
create mode 100644 Documentation/blame-config.txt
diff --git a/Documentation/blame-config.txt b/Documentation/blame-config.txt
new file mode 100644
index 0000000000..67b5c1d1e0
--- /dev/null
+++ b/Documentation/blame-config.txt
@@ -0,0 +1,21 @@
+blame.blankBoundary::
+ Show blank commit object name for boundary commits in
+ linkgit:git-blame[1]. This option defaults to false.
+
+blame.coloring::
+ This determines the coloring scheme to be applied to blame
+ output. It can be 'repeatedLines', 'highlightRecent',
+ or 'none' which is the default.
+
+blame.date::
+ Specifies the format used to output dates in linkgit:git-blame[1].
+ If unset the iso format is used. For supported values,
+ see the discussion of the `--date` option at linkgit:git-log[1].
+
+blame.showEmail::
+ Show the author email instead of author name in linkgit:git-blame[1].
+ This option defaults to false.
+
+blame.showRoot::
+ Do not treat root commits as boundaries in linkgit:git-blame[1].
+ This option defaults to false.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index db259129b0..910dcf1c25 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -299,27 +299,7 @@ include::am-config.txt[]
include::apply-config.txt[]
-blame.blankBoundary::
- Show blank commit object name for boundary commits in
- linkgit:git-blame[1]. This option defaults to false.
-
-blame.coloring::
- This determines the coloring scheme to be applied to blame
- output. It can be 'repeatedLines', 'highlightRecent',
- or 'none' which is the default.
-
-blame.date::
- Specifies the format used to output dates in linkgit:git-blame[1].
- If unset the iso format is used. For supported values,
- see the discussion of the `--date` option at linkgit:git-log[1].
-
-blame.showEmail::
- Show the author email instead of author name in linkgit:git-blame[1].
- This option defaults to false.
-
-blame.showRoot::
- Do not treat root commits as boundaries in linkgit:git-blame[1].
- This option defaults to false.
+include::blame-config.txt[]
branch.autoSetupMerge::
Tells 'git branch' and 'git checkout' to set up new branches
--
2.19.1.647.g708186aaf9
