diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-22 03:47:14 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-22 03:47:14 +0300 |
| commit | 8318eb795e4bda87d16871ac8ddd5afed033d551 (patch) | |
| tree | 41c0ac736ec5b313af7c745449b4cada6215ba4b /Documentation | |
| parent | f135e72d611ff6faf3d413a85f1620227d9f0705 (diff) | |
| parent | 17f26a9ee3298dfa0a1df7cd4e5f5f32342e5f62 (diff) | |
Merge branch 'kb/am-directory'
* kb/am-directory:
git-am: fix shell quoting
git-am: add --directory=<dir> option
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-am.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index b9c6fac748..5cbbe76937 100644 --- a/Documentation/git-am.txt +++ b/Documentation/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. |