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 /diff-files.c | |
| parent | Use sha1_file.c's mkdir-like routine in apply.c. (diff) | |
| parent | get_sha1_1: allow octopus^12 to be properly parsed. (diff) | |
| parent | combine-diff: finishing touches to git-diff-tree --cc (diff) | |
| parent | whitespace cleanup. (diff) | |
| download | git-2d310d8a018ca1a8d3e4c8a52f60ae5f57f34b31.tar.gz git-2d310d8a018ca1a8d3e4c8a52f60ae5f57f34b31.zip | |
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.