X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-annotate.perl;h=08d479f4b9b0d4911543ce35714bef13adbb8d20;hb=cd1333db4f41c44930884176601a8f7725fdd0fa;hp=cd476c76297daa9ce99718b429835debd2d76ed1;hpb=0c1fc940eeae051e890304c40d1e66a478afadc8;p=git.git diff --git a/git-annotate.perl b/git-annotate.perl index cd476c76..08d479f4 100755 --- a/git-annotate.perl +++ b/git-annotate.perl @@ -15,6 +15,8 @@ sub usage() { print STDERR 'Usage: ${\basename $0} [-s] [-S revs-file] file [ revision ] -l, --long Show long rev (Defaults off) + -t, --time + Show raw timestamp (Defaults off) -r, --rename Follow renames (Defaults on). -S, --rev-file revs-file @@ -26,9 +28,10 @@ sub usage() { exit(1); } -our ($help, $longrev, $rename, $starting_rev, $rev_file) = (0, 0, 1); +our ($help, $longrev, $rename, $rawtime, $starting_rev, $rev_file) = (0, 0, 1); my $rc = GetOptions( "long|l" => \$longrev, + "time|t" => \$rawtime, "help|h" => \$help, "rename|r" => \$rename, "rev-file|S=s" => \$rev_file); @@ -411,8 +414,10 @@ sub git_commit_info { } sub format_date { + if ($rawtime) { + return $_[0]; + } my ($timestamp, $timezone) = split(' ', $_[0]); - return strftime("%Y-%m-%d %H:%M:%S " . $timezone, gmtime($timestamp)); }