diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-11-26 11:57:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-26 11:57:31 -0800 |
| commit | aa14a0c3f191ee4df7344eed119be5b4a527a0ff (patch) | |
| tree | 1f0b79d76fef5d196d2aeed2e858c2866e71a6a0 /Documentation/merge-config.txt | |
| parent | Merge branch 'mm/sort-config-doc' (diff) | |
| parent | Merge branch 'mm/maint-sort-config-doc' into maint (diff) | |
| download | tgif-aa14a0c3f191ee4df7344eed119be5b4a527a0ff.tar.xz | |
Merge branch 'maint'
* maint:
Teach "git diff" to honour --[no-]ext-diff
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions