diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:54:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:55:05 -0700 |
| commit | 9a0231b395cb9720365b7066312eeaa86e37ed31 (patch) | |
| tree | c0bbb57aeb5653275e237f72f1da25599e29056c /builtin/merge.c | |
| parent | Update draft release notes for 7th batch (diff) | |
| parent | t7003: add test to filter a branch with a commit at epoch (diff) | |
| download | tgif-9a0231b395cb9720365b7066312eeaa86e37ed31.tar.xz | |
Merge branch 'jc/maint-filter-branch-epoch-date'
In 1.7.9 era, we taught "git rebase" about the raw timestamp format
but we did not teach the same trick to "filter-branch", which rolled
a similar logic on its own. Because of this, "filter-branch" failed
to rewrite commits with ancient timestamps.
* jc/maint-filter-branch-epoch-date:
t7003: add test to filter a branch with a commit at epoch
date.c: Fix off by one error in object-header date parsing
filter-branch: do not forget the '@' prefix to force git-timestamp
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions