diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-24 14:12:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 14:12:12 -0700 |
| commit | df5384b09870c6ffdd80c620caa066b2f997ca20 (patch) | |
| tree | 61869c4e003760c97119d79b09aaf8ff3eda50bf /git-am.txt | |
| parent | ce447ab917ea7f6b852fee7dfb18e4b24acc6bef (diff) | |
| download | git-htmldocs-df5384b09870c6ffdd80c620caa066b2f997ca20.tar.gz | |
Autogenerated HTML docs for v2.4.4-488-gdf97e
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-am.txt b/git-am.txt index 0d8ba48f7..dbea6e7ae 100644 --- a/git-am.txt +++ b/git-am.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] - [--3way] [--interactive] [--committer-date-is-author-date] + [--[no-]3way] [--interactive] [--committer-date-is-author-date] [--ignore-date] [--ignore-space-change | --ignore-whitespace] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet] @@ -90,10 +90,13 @@ default. You can use `--no-utf8` to override this. -3:: --3way:: +--no-3way:: When the patch does not apply cleanly, fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs - available locally. + available locally. `--no-3way` can be used to override + am.threeWay configuration variable. For more information, + see am.threeWay in linkgit:git-config[1]. --ignore-space-change:: --ignore-whitespace:: |