git.verplant.org Git - git.git/commit

author	Junio C Hamano <junkio@cox.net>
	Wed, 17 May 2006 10:04:14 +0000 (03:04 -0700)
committer	Junio C Hamano <junkio@cox.net>
	Wed, 17 May 2006 10:04:14 +0000 (03:04 -0700)
commit	aedb8995f841949ce29e05ea7e5c03c2d5466089
tree	d54b7a99e00395da2e8329836befbc6a1e7f96f0	tree \| snapshot
parent	fa09339509e5c4c080b137d848c54a5bb21a13f8	commit \| diff
parent	6cdfd1797486138f50f1929c39e77a2cd1e3e033	commit \| diff

Merge branch 'ew/pretty-fmt' into next

* ew/pretty-fmt:
commit: allow --pretty= args to be abbreviated

Conflicts:

commit.c - adjust to --pretty=email