git.tremily.us Git - git.git/commit

projects / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5a62b53 2c733fb)

author	Junio C Hamano <gitster@pobox.com>
	Mon, 13 Feb 2012 19:42:15 +0000 (11:42 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 13 Feb 2012 19:42:15 +0000 (11:42 -0800)
commit	87cb3b82a42613dc3ffd1eddf95f8c306a045ad1
tree	056bc067a0f6de58609373179d1795df07821627	tree \| snapshot
parent	5a62b531ae1fda10d023082cb73a5440dbd54df1	commit \| diff
parent	2c733fb24c10a9d7aacc51f956bf9b7881980870	commit \| diff

Merge branch 'jc/parse-date-raw' into maint

* jc/parse-date-raw:
parse_date(): '@' prefix forces git-timestamp
parse_date(): allow ancient git-timestamp

builtin/commit.c	diff1 \|	diff2 \|	blob \| history
date.c	diff1 \|	diff2 \|	blob \| history
git-sh-setup.sh	diff1 \|	diff2 \|	blob \| history
t/t3400-rebase.sh	diff1 \|	diff2 \|	blob \| history

Git—the stupid content tracker