From: Phillip Wood Date: Wed, 13 Mar 2019 18:27:55 GMT Subject: [PATCH 3/4] am: document --rerere-autoupdate Message-ID: <20190313182756.8076-3-phillip.wood123@gmail.com> In-Reply-To: <20190313182756.8076-1-phillip.wood123@gmail.com> From: Phillip Wood This option was missing from the man page. Signed-off-by: Phillip Wood --- Documentation/git-am.txt | 5 +++++ 1 file changed, 5 insertions(+) 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=