diff options
Diffstat (limited to 'git-am.txt')
-rw-r--r-- | git-am.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/git-am.txt b/git-am.txt index 09107fb10..320da6c4f 100644 --- a/git-am.txt +++ b/git-am.txt @@ -112,10 +112,7 @@ 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. +include::rerere-options.txt[] --ignore-space-change:: --ignore-whitespace:: |