[PATCH v4 4/6] doc: git-revert: link to new merge conflicts guide
From: Julia Evans <julia@jvns.ca>
Signed-off-by: Julia Evans <julia@jvns.ca>
---
Documentation/git-revert.adoc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Documentation/git-revert.adoc b/Documentation/git-revert.adoc
index ffba365e63..bb0f859f66 100644
--- a/Documentation/git-revert.adoc
+++ b/Documentation/git-revert.adoc
@@ -31,6 +31,10 @@ both will discard uncommitted changes in your working directory.
See "Reset, restore and revert" in linkgit:git[1] for the differences
between the three commands.
+Reverting a commit may result in a merge conflict.
+See linkgit:gitmergeconflicts[7] (or `git help mergeconflicts`)
+for a guide to handling merge conflicts.
+
OPTIONS
-------
<commit>...::
@@ -162,6 +166,7 @@ include::config/revert.adoc[]
SEE ALSO
--------
linkgit:git-cherry-pick[1]
+linkgit:gitmergeconflicts[7]
GIT
---
--
gitgitgadget