diff mbox series

[2/4] cherry-pick/revert: document --rerere-autoupdate

Message ID 20190313182756.8076-2-phillip.wood123@gmail.com (mailing list archive)
State New, archived
Headers show
Series [1/4] rebase: document --rerere-autoupdate | expand

Commit Message

Phillip Wood March 13, 2019, 6:27 p.m. UTC 
From: Phillip Wood <phillip.wood@dunelm.org.uk>

This option was missing from the man pages.
---
 Documentation/git-cherry-pick.txt | 5 +++++
 Documentation/git-revert.txt      | 5 +++++
 2 files changed, 10 insertions(+)
diff mbox series

Patch

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index b8cfeec67e..d64e72462f 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -148,6 +148,11 @@  effect to your index in a row.
 	Pass the merge strategy-specific option through to the
 	merge strategy.  See linkgit:git-merge[1] for details.
 
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+	Allow the rerere mechanism to update the index with the
+	result of auto-conflict resolution if possible.
+
 SEQUENCER SUBCOMMANDS
 ---------------------
 include::sequencer.txt[]
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 837707a8fd..6afccb2f1e 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -101,6 +101,11 @@  effect to your index in a row.
 	Pass the merge strategy-specific option through to the
 	merge strategy.  See linkgit:git-merge[1] for details.
 
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+	Allow the rerere mechanism to update the index with the
+	result of auto-conflict resolution if possible.
+
 SEQUENCER SUBCOMMANDS
 ---------------------
 include::sequencer.txt[]