| commit | e1165dd1442017c2b2722027168c497640f25746 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Jun 2010 18:55:37 +0000 (30 11:55 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Jun 2010 18:55:37 +0000 (30 11:55 -0700) | ||
| tree | 6b1d95aa8cd3a213bfee6eee59de308da028068a | treesnapshot (tar.gz zip) |
| parent | c9eaaab4165d8f402930d12899ec097495b599e6 | commitdiff |
| parent | 6ed7ddaadba9217b794aecf6d74a2e455daf7a96 | commitdiff |
Merge branch 'jl/maint-diff-ignore-submodules'
* jl/maint-diff-ignore-submodules:
t4027,4041: Use test -s to test for an empty file
Add optional parameters to the diff option "--ignore-submodules"
git diff: rename test that had a conflicting name
* jl/maint-diff-ignore-submodules:
t4027,4041: Use test -s to test for an empty file
Add optional parameters to the diff option "--ignore-submodules"
git diff: rename test that had a conflicting name
| Documentation/diff-options.txt | diff1 | diff2 | blobhistory |
| diff.c | diff1 | diff2 | blobhistory |