diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-27 13:45:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-27 13:45:09 -0700 |
| commit | 2ce0aac108b9c935f3ac01e98478120df1f52ce1 (patch) | |
| tree | c624a2e9df8a9e31ef1dd84b201fd111c8b16680 /git-am.txt | |
| parent | f50c76bb490021aed8372077b0664d4b4c335959 (diff) | |
| download | git-htmldocs-2ce0aac108b9c935f3ac01e98478120df1f52ce1.tar.gz | |
Autogenerated HTML docs for v2.5.0
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/git-am.txt b/git-am.txt index dbea6e7ae..0d8ba48f7 100644 --- a/git-am.txt +++ b/git-am.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] - [--[no-]3way] [--interactive] [--committer-date-is-author-date] + [--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,13 +90,10 @@ 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. `--no-3way` can be used to override - am.threeWay configuration variable. For more information, - see am.threeWay in linkgit:git-config[1]. + available locally. --ignore-space-change:: --ignore-whitespace:: |