Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
am: Document new --exclude=<path> option
author
maximilian attems
<max@stro.at>
Tue, 9 Aug 2011 15:21:08 +0000
(17:21 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 9 Aug 2011 19:05:24 +0000
(12:05 -0700)
The --exclude=<path> option is passed down to apply; document it as such.
Signed-off-by: maximilian attems <max@stro.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-am.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
77e9e49
)
diff --git
a/Documentation/git-am.txt
b/Documentation/git-am.txt
index 6b1b5af64e2daec1ecc8ee832f58f5186d740a79..887466d7777bb3cedce976b55d446f0f7803c423 100644
(file)
--- a/
Documentation/git-am.txt
+++ b/
Documentation/git-am.txt
@@
-13,7
+13,8
@@
SYNOPSIS
[--3way] [--interactive] [--committer-date-is-author-date]
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
[--3way] [--interactive] [--committer-date-is-author-date]
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
- [--reject] [-q | --quiet] [--scissors | --no-scissors]
+ [--exclude=<path>] [--reject] [-q | --quiet]
+ [--scissors | --no-scissors]
[(<mbox> | <Maildir>)...]
'git am' (--continue | --skip | --abort)
[(<mbox> | <Maildir>)...]
'git am' (--continue | --skip | --abort)
@@
-87,6
+88,7
@@
default. You can use `--no-utf8` to override this.
-C<n>::
-p<n>::
--directory=<dir>::
-C<n>::
-p<n>::
--directory=<dir>::
+--exclude=<path>::
--reject::
These flags are passed to the 'git apply' (see linkgit:git-apply[1])
program that applies
--reject::
These flags are passed to the 'git apply' (see linkgit:git-apply[1])
program that applies