diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-08 20:10:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-08 20:10:05 -0800 |
| commit | dabc42c7134596092bf59adb83c79b09f729c290 (patch) | |
| tree | 0e14f06997bf7a70cbcda9b1481b8295098b5f5e /Documentation | |
| parent | b59fd2098e6606e1a696fc1cafe897e074ed6d6f (diff) | |
| parent | 3041c324305e2bad59d7372336940846646dd46a (diff) | |
| download | git-dabc42c7134596092bf59adb83c79b09f729c290.tar.gz git-dabc42c7134596092bf59adb83c79b09f729c290.tar.xz | |
Merge branch 'jc/am'
* jc/am:
am: --rebasing
am: remove support for -d .dotest
am: read from the right mailbox when started from a subdirectory
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-am.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index e640fc75c..2387a8d6c 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -9,7 +9,7 @@ git-am - Apply a series of patches from a mailbox SYNOPSIS -------- [verse] -'git-am' [--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8] +'git-am' [--signoff] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] [--binary] [--whitespace=<option>] [-C<n>] [-p<n>] <mbox>|<Maildir>... @@ -32,10 +32,6 @@ OPTIONS Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. --d=<dir>, --dotest=<dir>:: - Instead of `.dotest` directory, use <dir> as a working - area to store extracted patches. - -k, --keep:: Pass `-k` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]). |