{"thread":{"id":"28054","subject":"[PATCH] git-am: Document new --exclude=<file> option","startedAt":"2011-08-09T15:21:08Z","lastAt":"2011-08-09T17:20:23Z","messageCount":2,"participants":["maximilian attems","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"173208","messageId":"1312903268-19994-1-git-send-email-max@stro.at","threadId":"28054","inReplyTo":null,"subject":"[PATCH] git-am: Document new --exclude=<file> option","fromName":"maximilian attems","fromEmail":"max@stro.at","sentAt":"2011-08-09T15:21:08Z","receivedAt":"2011-08-09T15:21:08Z","isPatch":true,"sender":{"key":"max@stro.at","avatar":"https://avatars.githubusercontent.com/u/1266461?v=4"},"body":"--exclude is passed down to apply, document it as such.\n\nSigned-off-by: maximilian attems <max@stro.at>\n---\n Documentation/git-am.txt |    4 +++-\n 1 files changed, 3 insertions(+), 1 deletions(-)\n\nHad to break up a line, not sure if the chose way is the preferred.\nThank you.\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 6b1b5af..62c8e3c 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -13,7 +13,8 @@ SYNOPSIS\n \t [--3way] [--interactive] [--committer-date-is-author-date]\n \t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n \t [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]\n-\t [--reject] [-q | --quiet] [--scissors | --no-scissors]\n+\t [--exclude=<file>] [--reject] [-q | --quiet]\n+\t [--scissors | --no-scissors]\n \t [(<mbox> | <Maildir>)...]\n 'git am' (--continue | --skip | --abort)\n \n@@ -87,6 +88,7 @@ default.   You can use `--no-utf8` to override this.\n -C<n>::\n -p<n>::\n --directory=<dir>::\n+--exclude=<file>::\n --reject::\n \tThese flags are passed to the 'git apply' (see linkgit:git-apply[1])\n \tprogram that applies\n-- \n1.7.5.4\n"},{"id":"173210","messageId":"7vy5z2sdrc.fsf@alter.siamese.dyndns.org","threadId":"28054","inReplyTo":"1312903268-19994-1-git-send-email-max@stro.at","subject":"Re: [PATCH] git-am: Document new --exclude=<file> option","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-08-09T17:20:23Z","receivedAt":"2011-08-09T17:20:23Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"maximilian attems <max@stro.at> writes:\n\n> diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\n> index 6b1b5af..62c8e3c 100644\n> --- a/Documentation/git-am.txt\n> +++ b/Documentation/git-am.txt\n> @@ -13,7 +13,8 @@ SYNOPSIS\n>  \t [--3way] [--interactive] [--committer-date-is-author-date]\n>  \t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n>  \t [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]\n> -\t [--reject] [-q | --quiet] [--scissors | --no-scissors]\n> +\t [--exclude=<file>] [--reject] [-q | --quiet]\n> +\t [--scissors | --no-scissors]\n\nPlease do not say \"<file>\" here (and below). git-apply.txt documents this\nas <path> and that is what the value of this parameter is.\n"}]}