diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-02-04 13:07:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-04 13:07:02 -0800 |
| commit | a4f004bffcea5b2cd8671738305962afe7b1d08f (patch) | |
| tree | 2116e03bd949b3bb4c6e50f5088b1192706e19eb /contrib/difftool/git-difftool.txt | |
| parent | Merge branch 'maint' (diff) | |
| parent | git-am: Add --ignore-date option (diff) | |
| download | tgif-a4f004bffcea5b2cd8671738305962afe7b1d08f.tar.xz | |
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
Diffstat (limited to 'contrib/difftool/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions