diff mbox series

[3/4] am: document --rerere-autoupdate

Message ID 20190313182756.8076-3-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 page.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
 Documentation/git-am.txt | 5 +++++
 1 file changed, 5 insertions(+)
diff mbox series

Patch

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 6f6c34b0f4..fc3b993c33 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -99,6 +99,11 @@  default.   You can use `--no-utf8` to override this.
 	am.threeWay configuration variable. For more information,
 	see am.threeWay in linkgit:git-config[1].
 
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+	Allow the rerere mechanism to update the index with the
+	result of auto-conflict resolution if possible.
+
 --ignore-space-change::
 --ignore-whitespace::
 --whitespace=<option>::