diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-13 19:42:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-13 19:42:15 (GMT) |
| commit | 87cb3b82a42613dc3ffd1eddf95f8c306a045ad1 (patch) | |
| tree | 056bc067a0f6de58609373179d1795df07821627 /git-sh-setup.sh | |
| parent | 5a62b531ae1fda10d023082cb73a5440dbd54df1 (diff) | |
| parent | 2c733fb24c10a9d7aacc51f956bf9b7881980870 (diff) | |
| download | git-87cb3b82a42613dc3ffd1eddf95f8c306a045ad1.zip git-87cb3b82a42613dc3ffd1eddf95f8c306a045ad1.tar.gz git-87cb3b82a42613dc3ffd1eddf95f8c306a045ad1.tar.bz2 | |
Merge branch 'jc/parse-date-raw' into maint
* jc/parse-date-raw:
parse_date(): '@' prefix forces git-timestamp
parse_date(): allow ancient git-timestamp
Diffstat (limited to 'git-sh-setup.sh')
| -rw-r--r-- | git-sh-setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 1fba6c2..5d8e4e6 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -200,7 +200,7 @@ get_author_ident_from_commit () { s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p g - s/^author [^<]* <[^>]*> \(.*\)$/\1/ + s/^author [^<]* <[^>]*> \(.*\)$/@\1/ s/.*/GIT_AUTHOR_DATE='\''&'\''/p q |