![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 4 Feb 2009 21:07:02 +0000 (13:07 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 4 Feb 2009 21:07:02 +0000 (13:07 -0800) | ||
| commit | a4f004bffcea5b2cd8671738305962afe7b1d08f | |
| tree | 2116e03bd949b3bb4c6e50f5088b1192706e19eb | tree | snapshot |
| parent | b63bc0bc3152ca42ba1c9fa9bed73da061beeca2 | commit | diff |
| parent | a79ec62d064e32b5c3979a16d215fdb70fe965c0 | commit | diff |
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
* ns/am-slacker:
git-am: Add --ignore-date option
am: Add --committer-date-is-author-date option
Conflicts:
git-am.sh
| git-am.sh | diff1 | | diff2 | | blob | history |