[PATCH 1/4] rebase: document --rerere-autoupdate
From: Phillip Wood <phillip.wood@dunelm.org.uk>
This option was missing from the man page.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
Documentation/git-rebase.txt | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 5629ba4c5d..fbf9a4d70a 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -300,6 +300,11 @@ See also INCOMPATIBLE OPTIONS below.
+
See also INCOMPATIBLE OPTIONS below.
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+ Allow the rerere mechanism to update the index with the
+ result of auto-conflict resolution if possible.
+
-S[<keyid>]::
--gpg-sign[=<keyid>]::
GPG-sign commits. The `keyid` argument is optional and
--
2.21.0