diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-02-12 07:15:35 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-02-12 07:15:35 +0000 |
| commit | 9dd8bb07118fe70186522d7d8fd7da7a785a2a5e (patch) | |
| tree | 8185046ca73ba739381e03f0c56f7e95d3679b3b /git-am.txt | |
| parent | 9cb74f2e1ce669d810cf666f33749c4785472ba6 (diff) | |
| download | git-htmldocs-9dd8bb07118fe70186522d7d8fd7da7a785a2a5e.tar.gz | |
Autogenerated HTML docs for v1.5.0-rc4-345-gb4d2
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-am.txt b/git-am.txt index 77ef103b2..4fb1d8441 100644 --- a/git-am.txt +++ b/git-am.txt @@ -10,7 +10,8 @@ SYNOPSIS -------- [verse] 'git-am' [--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way] - [--interactive] [--whitespace=<option>] <mbox>... + [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>] + <mbox>... 'git-am' [--skip | --resolved] DESCRIPTION @@ -68,8 +69,8 @@ default. You could use `--no-utf8` to override this. This flag is passed to the `git-apply` program that applies the patch. --C<n>:: - This flag is passed to the `git-apply` program that applies +-C<n>, -p<n>:: + These flag are passed to the `git-apply` program that applies the patch. --interactive:: |