Merge branch 'maint'

[git.git] / Documentation / git-am.txt

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 2ffba2102b1c2a7dbd093fed89a15b2e644aa398..46544a07694a90db908729b6badf92370f37226b 100644 (file)
--- 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]
 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>...
          [--3way] [--interactive] [--binary]
          [--whitespace=<option>] [-C<n>] [-p<n>]
          <mbox>|<Maildir>...


@@ -28,18 +28,17 @@ OPTIONS
        supply this argument, reads from the standard input. If you supply
        directories, they'll be treated as Maildirs.
 
        supply this argument, reads from the standard input. If you supply
        directories, they'll be treated as Maildirs.
 

--s, --signoff::
+-s::
+--signoff::

        Add `Signed-off-by:` line to the commit message, using
        the committer identity of yourself.
 
        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::
+-k::
+--keep::

        Pass `-k` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]).
 
        Pass `-k` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]).
 

--u, --utf8::
+-u::
+--utf8::

        Pass `-u` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]).
        The proposed commit log message taken from the e-mail
        is re-coded into UTF-8 encoding (configuration variable
        Pass `-u` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]).
        The proposed commit log message taken from the e-mail
        is re-coded into UTF-8 encoding (configuration variable


@@ -53,13 +52,15 @@ default.   You could use `--no-utf8` to override this.
        Pass `-n` flag to `git-mailinfo` (see
        linkgit:git-mailinfo[1]).
 
        Pass `-n` flag to `git-mailinfo` (see
        linkgit:git-mailinfo[1]).
 

--3, --3way::
+-3::
+--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.
 
        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.
 

--b, --binary::
+-b::
+--binary::

        Pass `--allow-binary-replacement` flag to `git-apply`
        (see linkgit:git-apply[1]).
 
        Pass `--allow-binary-replacement` flag to `git-apply`
        (see linkgit:git-apply[1]).
 


@@ -68,19 +69,22 @@ default.   You could use `--no-utf8` to override this.
        program that applies
        the patch.
 
        program that applies
        the patch.
 

--C<n>, -p<n>::
+-C<n>::
+-p<n>::

        These flags are passed to the `git-apply` (see linkgit:git-apply[1])
        program that applies
        the patch.
 
        These flags are passed to the `git-apply` (see linkgit:git-apply[1])
        program that applies
        the patch.
 

--i, --interactive::
+-i::
+--interactive::

        Run interactively.
 
 --skip::
        Skip the current patch.  This is only meaningful when
        restarting an aborted patch.
 
        Run interactively.
 
 --skip::
        Skip the current patch.  This is only meaningful when
        restarting an aborted patch.
 

--r, --resolved::
+-r::
+--resolved::

        After a patch failure (e.g. attempting to apply
        conflicting patch), the user has applied it by hand and
        the index file stores the result of the application.
        After a patch failure (e.g. attempting to apply
        conflicting patch), the user has applied it by hand and
        the index file stores the result of the application.


@@ -138,7 +142,7 @@ aborts in the middle,.  You can recover from this in one of two ways:
 
 The command refuses to process new mailboxes while `.dotest`
 directory exists, so if you decide to start over from scratch,
 
 The command refuses to process new mailboxes while `.dotest`
 directory exists, so if you decide to start over from scratch,

-run `rm -f .dotest` before running the command with mailbox
+run `rm -f -r .dotest` before running the command with mailbox

 names.
 
 
 names.
 
 


@@ -157,4 +161,4 @@ Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.o
 
 GIT
 ---
 
 GIT
 ---

-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite