git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] git-am: Document new --exclude=<file> option
@ 2011-08-09 15:21 maximilian attems
  2011-08-09 17:20 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: maximilian attems @ 2011-08-09 15:21 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano, maximilian attems

--exclude is passed down to apply, document it as such.

Signed-off-by: maximilian attems <max@stro.at>
---
 Documentation/git-am.txt |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Had to break up a line, not sure if the chose way is the preferred.
Thank you.

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 6b1b5af..62c8e3c 100644
--- 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>]
-	 [--reject] [-q | --quiet] [--scissors | --no-scissors]
+	 [--exclude=<file>] [--reject] [-q | --quiet]
+	 [--scissors | --no-scissors]
 	 [(<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>::
+--exclude=<file>::
 --reject::
 	These flags are passed to the 'git apply' (see linkgit:git-apply[1])
 	program that applies
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] git-am: Document new --exclude=<file> option
  2011-08-09 15:21 [PATCH] git-am: Document new --exclude=<file> option maximilian attems
@ 2011-08-09 17:20 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2011-08-09 17:20 UTC (permalink / raw)
  To: maximilian attems; +Cc: git

maximilian attems <max@stro.at> writes:

> diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
> index 6b1b5af..62c8e3c 100644
> --- 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>]
> -	 [--reject] [-q | --quiet] [--scissors | --no-scissors]
> +	 [--exclude=<file>] [--reject] [-q | --quiet]
> +	 [--scissors | --no-scissors]

Please do not say "<file>" here (and below). git-apply.txt documents this
as <path> and that is what the value of this parameter is.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-08-09 17:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-09 15:21 [PATCH] git-am: Document new --exclude=<file> option maximilian attems
2011-08-09 17:20 ` Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).