diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-01-22 03:38:50 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-01-22 03:38:50 +0000 |
| commit | cc0cb3165acf037c2894084b377781b8fbce6c12 (patch) | |
| tree | 8094c1b3dc974a18238215dc4e15aefeba8df623 /git-am.txt | |
| parent | bc4852e8d68ccfc18b8d3c0cf4c3d602917d454a (diff) | |
| download | git-htmldocs-cc0cb3165acf037c2894084b377781b8fbce6c12.tar.gz | |
Autogenerated HTML docs for v1.6.1-265-g9a013
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 b9c6fac74..5cbbe7693 100644 --- a/git-am.txt +++ b/git-am.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git am' [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] - [--whitespace=<option>] [-C<n>] [-p<n>] + [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] [<mbox> | <Maildir>...] 'git am' (--skip | --resolved | --abort) @@ -60,12 +60,9 @@ default. You could use `--no-utf8` to override this. available locally. --whitespace=<option>:: - This flag is passed to the 'git-apply' (see linkgit:git-apply[1]) - program that applies - the patch. - -C<n>:: -p<n>:: +--directory=<dir>:: These flags are passed to the 'git-apply' (see linkgit:git-apply[1]) program that applies the patch. |