| commit | 057acb790826b1d876bad588fd2db85878fa3ef7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Jun 2010 17:56:35 +0000 (23 10:56 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Jun 2010 17:56:35 +0000 (23 10:56 -0700) | ||
| tree | 2d71b95532115a6568beec8088b392fa1c3a8bb0 | treesnapshot (tar.gz zip) |
| parent | e61649cc3bc020c689bcde4398bdff2345448f72 | commitdiff |
| parent | dd44d419d30afa52b863efa07aeec738c4531ea9 | commitdiff |
Merge branch 'jl/maint-diff-ignore-submodules' into next
* jl/maint-diff-ignore-submodules:
Add optional parameters to the diff option "--ignore-submodules"
git diff: rename test that had a conflicting name
* jl/maint-diff-ignore-submodules:
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 |
| diff.h | diff1 | diff2 | blobhistory |