From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 Feb 2009 21:07:02 +0000 (-0800)
Subject: Merge branch 'ns/am-slacker'
X-Git-Tag: v1.6.2-rc0~30
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a4f004bffcea5b2cd8671738305962afe7b1d08f;p=git.git

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
---

a4f004bffcea5b2cd8671738305962afe7b1d08f
diff --cc git-am.sh
index b598b4332,1e40ce92e..8bcb20602
--- a/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.
+ committer-date-is-author-date    lie about committer date
+ ignore-date     use current timestamp for author date
 -rebasing        (internal use for git-rebase)"
 +rebasing*       (internal use for git-rebase)"
  
  . git-sh-setup
  prefix=$(git rev-parse --show-prefix)