From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 Jan 2015 22:00:16 +0000 (-0800)
Subject: Merge branch 'rw/apply-does-not-take-ignore-date' into maint
X-Git-Tag: v2.2.2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ba1edc92646ec0adf392542ad94fcafe5636f7c2?ds=inline;hp=-c

Merge branch 'rw/apply-does-not-take-ignore-date' into maint

* rw/apply-does-not-take-ignore-date:
git-am.txt: --ignore-date flag is not passed to git-apply
---

ba1edc92646ec0adf392542ad94fcafe5636f7c2
diff --combined Documentation/git-am.txt
index 9adce372ec,ab6269b356..d4ef16c16a
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@@ -9,14 -9,13 +9,14 @@@ git-am - Apply a series of patches fro
  SYNOPSIS
  --------
  [verse]
 -'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
 +'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]
  	 [--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]
 -	 [<mbox> | <Maildir>...]
 -'git am' (--skip | --resolved | --abort)
 +	 [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
 +	 [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
 +	 [(<mbox> | <Maildir>)...]
 +'git am' (--continue | --skip | --abort)
  
  DESCRIPTION
  -----------
@@@ -26,7 -25,7 +26,7 @@@ current branch
  
  OPTIONS
  -------
 -<mbox>|<Maildir>...::
 +(<mbox>|<Maildir>)...::
  	The list of mailbox files to read patches from. If you do not
  	supply this argument, the command reads from the standard input.
  	If you supply directories, they will be treated as Maildirs.
@@@ -38,24 -37,7 +38,24 @@@
  
  -k::
  --keep::
 -	Pass `-k` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]).
 +	Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
 +
 +--keep-non-patch::
 +	Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
 +
 +--[no-]keep-cr::
 +	With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1])
 +	with the same option, to prevent it from stripping CR at the end of
 +	lines. `am.keepcr` configuration variable can be used to specify the
 +	default behaviour.  `--no-keep-cr` is useful to override `am.keepcr`.
 +
 +-c::
 +--scissors::
 +	Remove everything in body before a scissors line (see
 +	linkgit:git-mailinfo[1]).
 +
 +--no-scissors::
 +	Ignore scissors lines (see linkgit:git-mailinfo[1]).
  
  -q::
  --quiet::
@@@ -63,7 -45,7 +63,7 @@@
  
  -u::
  --utf8::
 -	Pass `-u` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]).
 +	Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
  	The proposed commit log message taken from the e-mail
  	is re-coded into UTF-8 encoding (configuration variable
  	`i18n.commitencoding` can be used to specify project's
@@@ -73,7 -55,7 +73,7 @@@ This was optional in prior versions of 
  default.   You can use `--no-utf8` to override this.
  
  --no-utf8::
 -	Pass `-n` flag to 'git-mailinfo' (see
 +	Pass `-n` flag to 'git mailinfo' (see
  	linkgit:git-mailinfo[1]).
  
  -3::
@@@ -83,26 -65,17 +83,25 @@@
  	it is supposed to apply to and we have those blobs
  	available locally.
  
- --ignore-date::
  --ignore-space-change::
  --ignore-whitespace::
  --whitespace=<option>::
  -C<n>::
  -p<n>::
  --directory=<dir>::
 +--exclude=<path>::
 +--include=<path>::
  --reject::
 -	These flags are passed to the 'git-apply' (see linkgit:git-apply[1])
 +	These flags are passed to the 'git apply' (see linkgit:git-apply[1])
  	program that applies
  	the patch.
  
 +--patch-format::
 +	By default the command will try to detect the patch format
 +	automatically. This option allows the user to bypass the automatic
 +	detection and specify the patch format that the patch(es) should be
 +	interpreted as. Valid formats are mbox, stgit, stgit-series and hg.
 +
  -i::
  --interactive::
  	Run interactively.
@@@ -125,11 -98,6 +124,11 @@@
  	Skip the current patch.  This is only meaningful when
  	restarting an aborted patch.
  
 +-S[<keyid>]::
 +--gpg-sign[=<keyid>]::
 +	GPG-sign commits.
 +
 +--continue::
  -r::
  --resolved::
  	After a patch failure (e.g. attempting to apply
@@@ -142,9 -110,9 +141,9 @@@
  --resolvemsg=<msg>::
  	When a patch failure occurs, <msg> will be printed
  	to the screen before exiting.  This overrides the
 -	standard message informing you to use `--resolved`
 +	standard message informing you to use `--continue`
  	or `--skip` to handle the failure.  This is solely
 -	for internal use between 'git-rebase' and 'git-am'.
 +	for internal use between 'git rebase' and 'git am'.
  
  --abort::
  	Restore the original branch and abort the patching operation.
@@@ -159,8 -127,10 +158,8 @@@ the commit, after stripping common pref
  The "Subject: " line is supposed to concisely describe what the
  commit is about in one line of text.
  
 -"From: " and "Subject: " lines starting the body (the rest of the
 -message after the blank line terminating the RFC2822 headers)
 -override the respective commit author name and title values taken
 -from the headers.
 +"From: " and "Subject: " lines starting the body override the respective
 +commit author name and title values taken from the headers.
  
  The commit message is formed by the title taken from the
  "Subject: ", a blank line and the body of the message up to
@@@ -186,11 -156,11 +185,11 @@@ aborts in the middle.  You can recover 
  
  . hand resolve the conflict in the working directory, and update
    the index file to bring it into a state that the patch should
 -  have produced.  Then run the command with the '--resolved' option.
 +  have produced.  Then run the command with the '--continue' option.
  
 -The command refuses to process new mailboxes while the `.git/rebase-apply`
 -directory exists, so if you decide to start over from scratch,
 -run `rm -f -r .git/rebase-apply` before running the command with mailbox
 +The command refuses to process new mailboxes until the current
 +operation is finished, so if you decide to start over from scratch,
 +run `git am --abort` before running the command with mailbox
  names.
  
  Before any patches are applied, ORIG_HEAD is set to the tip of the
@@@ -199,16 -169,20 +198,16 @@@ commits, like running 'git am' on the w
  commits that is more easily fixed by changing the mailbox (e.g.
  errors in the "From:" lines).
  
 +HOOKS
 +-----
 +This command can run `applypatch-msg`, `pre-applypatch`,
 +and `post-applypatch` hooks.  See linkgit:githooks[5] for more
 +information.
  
  SEE ALSO
  --------
  linkgit:git-apply[1].
  
 -
 -Author
 -------
 -Written by Junio C Hamano <gitster@pobox.com>
 -
 -Documentation
 ---------------
 -Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.
 -
  GIT
  ---
  Part of the linkgit:git[1] suite