threads / patch / 28054

patchgit-am: Document new --exclude=<file> option

Subject: [PATCH] git-am: Document new --exclude=<file> option

## tl;dr

2 messages between Aug 9, 2011 and Aug 9, 2011. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

maximilian attems· Aug 9, 2011, 15:21 UTC · lore
--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.

Show changes to Documentation/git-am.txt +3 −1
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
Junio C Hamano· Aug 9, 2011, 17:20 UTC · re: maximilian attems · lore

Re: [PATCH] git-am: Document new --exclude=<file> option

maximilian attems <max@stro.at> writes:
Show 11 quoted lines
> 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.

← back to recent threads