Merge branch 'ns/am-slacker'

* ns/am-slacker:
  git-am: Add --ignore-date option
  am: Add --committer-date-is-author-date option

Conflicts:
	git-am.sh

diff --cc git-am.sh
index b598b4332a6224bb5c8363afdcff7cb9a3f3dbcd,1e40ce92e62cc0972cc60ed7f06dff07ec37a9a3..8bcb206022ae5d4ae82d2a37d8f79454c043ad78
--- 1/git-am.sh
--- 2/git-am.sh
+++ b/git-am.sh
@@@ -23,7 -24,9 +23,9 @@@ resolvemsg=     override error message 
  r,resolved      to be used after a patch failure
  skip            skip the current patch
  abort           restore the original branch and abort the patching operation.
 -rebasing        (internal use for git-rebase)"
+ committer-date-is-author-date    lie about committer date
+ ignore-date     use current timestamp for author date
 +rebasing*       (internal use for git-rebase)"
  
  . git-sh-setup
  prefix=$(git rev-parse --show-prefix)