git.octo.it Git - git.git/commit

author	Junio C Hamano <junkio@cox.net>
	Tue, 14 Feb 2006 07:34:58 +0000 (23:34 -0800)
committer	Junio C Hamano <junkio@cox.net>
	Tue, 14 Feb 2006 07:34:58 +0000 (23:34 -0800)
commit	6a9b87972f27edfe53da4ce016adf4c0cd42f5e6
tree	8bf0c7f24c13ab2cd0e401ef1b609d30486606e9	tree \| snapshot
parent	057f98eda179491c3f32c556f523e8786c2cbab5	commit \| diff
parent	365463851303f74eb5e5be7101811f215602fcd9	commit \| diff

Merge some proposed fixes

Conflicts:

Documentation/git-commit.txt - taking the post 1.2.0 semantics.

Signed-off-by: Junio C Hamano <junkio@cox.net>