![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8361e1d 0601dbe f7a3d33 8fcf7f9)
raw | combined (merge: 8361e1d 0601dbe f7a3d33 8fcf7f9)
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 4 Feb 2006 07:52:20 +0000 (23:52 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 4 Feb 2006 07:52:20 +0000 (23:52 -0800) |
* 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.
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.
Trivial merge