summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-06-27 16:13:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-06-27 16:13:41 (GMT)
commit49c837424a6152618aad42fa6d5083c6be1fa718 (patch)
tree4167098ddc2d78a35d9783bcdb8112f365fec681
parent5dba4d65403ddd428c89bedf1bc517736ece1d38 (diff)
parentfc0f8bcd64eb0a03a7098f72da9c4008bd48cf11 (diff)
downloadgit-49c837424a6152618aad42fa6d5083c6be1fa718.zip
git-49c837424a6152618aad42fa6d5083c6be1fa718.tar.gz
git-49c837424a6152618aad42fa6d5083c6be1fa718.tar.bz2
Merge branch 'jc/revert-show-parent-info'
* jc/revert-show-parent-info: revert: config documentation fixes
-rw-r--r--Documentation/config.txt2
-rw-r--r--Documentation/config/revert.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e284b04..e376d54 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -495,6 +495,8 @@ include::config/repack.txt[]
include::config/rerere.txt[]
+include::config/revert.txt[]
+
include::config/safe.txt[]
include::config/sendemail.txt[]
diff --git a/Documentation/config/revert.txt b/Documentation/config/revert.txt
index 797bfb6..802d6fa 100644
--- a/Documentation/config/revert.txt
+++ b/Documentation/config/revert.txt
@@ -1,3 +1,3 @@
revert.reference::
- Setting this variable to true makes `git revert` to behave
+ Setting this variable to true makes `git revert` behave
as if the `--reference` option is given.