diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-03 23:52:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-03 23:52:20 -0800 |
| commit | 2d310d8a018ca1a8d3e4c8a52f60ae5f57f34b31 (patch) | |
| tree | 775c36bea2c195456df99b941ec37e5ba70be375 | |
| parent | 8361e1d4d343a33a60145129dcf8c08ec7de84f2 (diff) | |
| parent | 0601dbe1784901a43289ff1575d3b8db33a191e1 (diff) | |
| parent | f7a3d33f0f93eba4db61819b289df76a32d61b1b (diff) | |
| parent | 8fcf7f9af5ba629f56f491791ae46ad2e939f3b5 (diff) | |
| download | git-2d310d8a018ca1a8d3e4c8a52f60ae5f57f34b31.tar.gz git-2d310d8a018ca1a8d3e4c8a52f60ae5f57f34b31.tar.xz | |
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.