projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix'
[git.git]
/
Documentation
/
git-am.txt
diff --git
a/Documentation/git-am.txt
b/Documentation/git-am.txt
index
a415fe2
..
910457d
100644
(file)
--- a/
Documentation/git-am.txt
+++ b/
Documentation/git-am.txt
@@
-8,7
+8,9
@@
git-am - Apply a series of patches in a mailbox
SYNOPSIS
--------
SYNOPSIS
--------
-'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>...
+[verse]
+'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
+ [--interactive] [--whitespace=<option>] <mbox>...
'git-am' [--skip | --resolved]
DESCRIPTION
'git-am' [--skip | --resolved]
DESCRIPTION
@@
-45,6
+47,10
@@
OPTIONS
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.
+--whitespace=<option>::
+ This flag is passed to the `git-apply` program that applies
+ the patch.
+
--interactive::
Run interactively, just like git-applymbox.
--interactive::
Run interactively, just like git-applymbox.
@@
-79,7
+85,7
@@
names.
SEE ALSO
--------
SEE ALSO
--------
-gitlink:git-applymbox[1], gitlink:git-applypatch[1].
+gitlink:git-applymbox[1], gitlink:git-applypatch[1]
, gitlink:git-apply[1]
.
Author
Author