diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-18 14:13:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-18 14:13:08 -0700 |
| commit | 04495a1941c77d95cb6ad521f45451da4f714af2 (patch) | |
| tree | ad4d9204d5b4c2ac489f99a1051faa1bf48d6ed7 /git-am.txt | |
| parent | 472c81a0f3cf8038d39479da1e3840ac33fe6ef8 (diff) | |
| download | git-htmldocs-04495a1941c77d95cb6ad521f45451da4f714af2.tar.gz | |
Autogenerated HTML docs for v2.37.2-382-g795ea
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:: |