summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Jakub Narebski <jnareb@gmail.com>2011-04-01 21:06:28 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-04 09:33:05 -0700
commit9029ebbe118dddfccae0dcbb921722257aef2ecd (patch)
tree81c9e89a5004f25eda7105cad01b584d0c4a3405 /Documentation/git-merge.txt
parentStart preparing for 1.7.4.4 (diff)
downloadtgif-9029ebbe118dddfccae0dcbb921722257aef2ecd.tar.xz
gitweb: Fix parsing of negative fractional timezones in JavaScript
Extract converting numerical timezone in the form of '(+|-)HHMM' to timezoneOffset function, and fix parsing of negative fractional timezones. This is used to format timestamps in 'blame_incremental' view; this complements commit 2b1e172 (gitweb: Fix handling of fractional timezones in parse_date, 2011-03-25). Now gitweb.cgi/git.git/blame_incremental/3fe5489:/contrib/gitview/gitview#l853 and gitweb.cgi/git.git/blame/3fe5489:/contrib/gitview/gitview#l853 show the same correct time in author's local timezone in title (on mouseover) [Aneesh Kumar K.V, 2006-02-24 00:59:42 +0530]. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions