Merge branches 'jc/sha1', 'jc/diff' and 'jc/ws'
* jc/sha1: get_sha1_1: allow octopus^12 to be properly parsed. * jc/diff: combine-diff: finishing touches to git-diff-tree --cc * jc/ws: whitespace cleanup.
Junio C Hamano committed
Feb 3, 2006 at 23:52 UTC
2d310d8a018ca1a8d3e4c8a52f60ae5f57f34b31
No changes.