From: Junio C Hamano <junkio@cox.net>
Date: Mon, 6 Feb 2006 07:55:45 +0000 (-0800)
Subject: Merge branch 'jc/diff'
X-Git-Tag: v1.2.0~55
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=a2c641c4ab66b5bdcb62c36a5f748b9f929d61b8;p=git.git

Merge branch 'jc/diff'

* jc/diff:
  git-diff-tree --stdin: show all parents.
  combine-diff: remove misguided --show-empty hack.
---

a2c641c4ab66b5bdcb62c36a5f748b9f929d61b8