Merge branches 'jc/sha1', 'jc/diff' and 'jc/ws'
commit2d310d8a018ca1a8d3e4c8a52f60ae5f57f34b31
authorJunio C Hamano <junkio@cox.net>
Sat, 4 Feb 2006 07:52:20 +0000 (3 23:52 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 4 Feb 2006 07:52:20 +0000 (3 23:52 -0800)
tree775c36bea2c195456df99b941ec37e5ba70be375
parent8361e1d4d343a33a60145129dcf8c08ec7de84f2
parent0601dbe1784901a43289ff1575d3b8db33a191e1
parentf7a3d33f0f93eba4db61819b289df76a32d61b1b
parent8fcf7f9af5ba629f56f491791ae46ad2e939f3b5
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.