diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-06-06 11:40:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-06 11:40:14 -0700 |
| commit | 456a4c08b8d8ddefda939014c15877ace3e3f499 (patch) | |
| tree | 02e78225fadc62bb3585494b9cb418d833bd8e01 /Documentation/git-merge.txt | |
| parent | Merge branch 'bc/maint-status-z-to-use-porcelain' (diff) | |
| parent | diff: futureproof "stop feeding the backend early" logic (diff) | |
| download | tgif-456a4c08b8d8ddefda939014c15877ace3e3f499.tar.xz | |
Merge branch 'jk/diff-not-so-quick'
* jk/diff-not-so-quick:
diff: futureproof "stop feeding the backend early" logic
diff_tree: disable QUICK optimization with diff filter
Conflicts:
diff.c
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions