Merge branch 'ns/am-slacker'
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 Feb 2009 21:07:02 +0000 (13:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Feb 2009 21:07:02 +0000 (13:07 -0800)
commita4f004bffcea5b2cd8671738305962afe7b1d08f
tree2116e03bd949b3bb4c6e50f5088b1192706e19eb
parentb63bc0bc3152ca42ba1c9fa9bed73da061beeca2
parenta79ec62d064e32b5c3979a16d215fdb70fe965c0
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
git-am.sh