summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-07-27 09:44:41 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-27 14:15:50 -0700
commit1a2a1e8eb93de2b89a32a52980ec7614fe9d154c (patch)
tree3856c85a1a0436d2416fcbd0d2c54aa0bbd85e87 /git-mergetool.sh
parentdoc/pretty-formats: explain shortening of %gd (diff)
downloadtgif-1a2a1e8eb93de2b89a32a52980ec7614fe9d154c.tar.xz
date: document and test "raw-local" mode
The "raw" format shows a Unix epoch timestamp, but with a timezone tacked on. The timestamp is not _in_ that zone, but it is extra information about the time (by default, the zone the author was in). The documentation claims that "raw-local" does not work. It does, but the end result is rather subtle. Let's describe it in better detail, and test to make sure it works (namely, the epoch time doesn't change, but the zone does). While we are rewording the documentation in this area, let's not use the phrase "does not work" for the remaining option, "--date=relative". It's vague; do we accept it or not? We do accept it, but it has no effect (which is a reasonable outcome). We should also refer to the option not as "--relative" (which is the historical synonym, and does not take "-local" at all), but as "--date=relative". Helped-by: Jakub Narębski <jnareb@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions