![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 6 Feb 2006 07:55:45 +0000 (23:55 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 6 Feb 2006 07:55:45 +0000 (23:55 -0800) | ||
| commit | a2c641c4ab66b5bdcb62c36a5f748b9f929d61b8 | |
| tree | c7f414f8d89f51a19ff04ad04f19f25ecc643e6b | tree | snapshot |
| parent | 12db4852de8d377d317e5a7cf11467e5d4c5773d | commit | diff |
| parent | 45392a648d7449d237ecc2507bc92378bf920bf0 | commit | diff |
Merge branch 'jc/diff'
* jc/diff:
git-diff-tree --stdin: show all parents.
combine-diff: remove misguided --show-empty hack.
* jc/diff:
git-diff-tree --stdin: show all parents.
combine-diff: remove misguided --show-empty hack.