index 67ad5da9cc0e766882300e90ed114306cb3c9fa7..23864df8da0694a0daefb81fe629e22a1deb06f1 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
[--reject] [-q | --quiet] [--scissors | --no-scissors]
[<mbox> | <Maildir>...]
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
[--reject] [-q | --quiet] [--scissors | --no-scissors]
[<mbox> | <Maildir>...]
-'git am' (--skip | --resolved | --abort)
+'git am' (--continue | --skip | --abort)
DESCRIPTION
-----------
DESCRIPTION
-----------
-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]).
-c::
--scissors::
Remove everything in body before a scissors line (see
linkgit:git-mailinfo[1]).
-c::
--scissors::
Remove everything in body before a scissors line (see
linkgit:git-mailinfo[1]).
----no-scissors::
+--no-scissors::
Ignore scissors lines (see linkgit:git-mailinfo[1]).
-q::
Ignore scissors lines (see linkgit:git-mailinfo[1]).
-q::
-u::
--utf8::
-u::
--utf8::
- Pass `-u` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]).
+ 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
`i18n.commitencoding` can be used to specify project's
The proposed commit log message taken from the e-mail
is re-coded into UTF-8 encoding (configuration variable
`i18n.commitencoding` can be used to specify project's
default. You can use `--no-utf8` to override this.
--no-utf8::
default. You can use `--no-utf8` to override this.
--no-utf8::
- Pass `-n` flag to 'git-mailinfo' (see
+ Pass `-n` flag to 'git mailinfo' (see
linkgit:git-mailinfo[1]).
-3::
linkgit:git-mailinfo[1]).
-3::
-p<n>::
--directory=<dir>::
--reject::
-p<n>::
--directory=<dir>::
--reject::
- These flags are passed to the 'git-apply' (see linkgit:git-apply[1])
+ These flags are passed to the 'git apply' (see linkgit:git-apply[1])
program that applies
the patch.
program that applies
the patch.
Skip the current patch. This is only meaningful when
restarting an aborted patch.
Skip the current patch. This is only meaningful when
restarting an aborted patch.
+--continue::
-r::
--resolved::
After a patch failure (e.g. attempting to apply
-r::
--resolved::
After a patch failure (e.g. attempting to apply
to the screen before exiting. This overrides the
standard message informing you to use `--resolved`
or `--skip` to handle the failure. This is solely
to the screen before exiting. This overrides the
standard message informing you to use `--resolved`
or `--skip` to handle the failure. This is solely
- for internal use between 'git-rebase' and 'git-am'.
+ for internal use between 'git rebase' and 'git am'.
--abort::
Restore the original branch and abort the patching operation.
--abort::
Restore the original branch and abort the patching operation.