diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-10-03 03:03:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-03 03:03:22 -0700 |
| commit | 5e5b2b98c844c791c87a3a084d7748b9d6888a0a (patch) | |
| tree | 08c211a872faf7738748578c03bfbce89cef8041 /git-mergetool.sh | |
| parent | fed276e7524d6a80ae5dec037d586bd28543fc79 (diff) | |
| parent | 96b2d4fa927c5055adc5b1d08f10a5d7352e2989 (diff) | |
| download | git-5e5b2b98c844c791c87a3a084d7748b9d6888a0a.tar.gz | |
Merge branch 'ap/dateformat'
* ap/dateformat:
Add a test script for for-each-ref, including test of date formatting
dateformat: parse %(xxdate) %(yydate:format) correctly
Make for-each-ref's grab_date() support per-atom formatting
Make for-each-ref allow atom names like "<name>:<something>"
parse_date_format(): convert a format name to an enum date_mode
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions