diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-03-20 15:16:04 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-20 15:16:04 +0900 |
| commit | 1b8f4dc580432107693a780010c240c2b676ff30 (patch) | |
| tree | c71d4f576b7375ca496a77a45c8aec8747e1d216 /builtin/checkout-index.c | |
| parent | Merge branch 'ab/makefile-help-devs-more' (diff) | |
| parent | bisect: make diff-tree output prettier (diff) | |
| download | tgif-1b8f4dc580432107693a780010c240c2b676ff30.tar.xz | |
Merge branch 'jk/bisect-final-output'
The final report from "git bisect" used to show the suspected
culprit using a raw "diff-tree", with which there is no output for
a merge commit. This has been updated to use a more modern and
human readable output that still is concise enough.
* jk/bisect-final-output:
bisect: make diff-tree output prettier
bisect: fix internal diff-tree config loading
bisect: use string arguments to feed internal diff-tree
Diffstat (limited to 'builtin/checkout-index.c')
0 files changed, 0 insertions, 0 deletions