summaryrefslogtreecommitdiff
path: root/mergetools/xxdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-09 16:53:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-09 20:42:54 -0700
commitcb102b083252b575b18afa8d4b4a4b1bc1ffdf9e (patch)
treef359c9671268f6753a8313b3fa0198fa2b4b1408 /mergetools/xxdiff
parentparse_date(): '@' prefix forces git-timestamp (diff)
downloadtgif-cb102b083252b575b18afa8d4b4a4b1bc1ffdf9e.tar.xz
filter-branch: do not forget the '@' prefix to force git-timestamp
For some reason, this script reinvents, instead of refactoring the existing one in git-sh-setup, the logic to grab ident information from an existing commit; it was missed when the corresponding logic in git-sh-setup was updated with 2c733fb (parse_date(): '@' prefix forces git-timestamp, 2012-02-02). Teach the script that it is OK to have a way ancient timestamp in the commits that are being filtered. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/xxdiff')
0 files changed, 0 insertions, 0 deletions