From: Junio C Hamano <junkio@cox.net>
Date: Sat, 4 Feb 2006 07:52:20 +0000 (-0800)
Subject: Merge branches 'jc/sha1', 'jc/diff' and 'jc/ws'
X-Git-Tag: v1.2.0~65
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2d310d8a018ca1a8d3e4c8a52f60ae5f57f34b31;p=git.git

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.
---

2d310d8a018ca1a8d3e4c8a52f60ae5f57f34b31