Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/xdiff-interface' | Junio C Hamano | 2018-11-13 | 1 | -25/+23 |
|\ | |||||
| * | diff: convert --check to use a hunk callback | Jeff King | 2018-11-05 | 1 | -8/+12 |
| * | diff: use hunk callback for word-diff | Jeff King | 2018-11-05 | 1 | -7/+5 |
| * | diff: discard hunk headers for patch-ids earlier | Jeff King | 2018-11-05 | 1 | -6/+2 |
| * | diff: avoid generating unused hunk header lines | Jeff King | 2018-11-05 | 1 | -2/+2 |
| * | xdiff-interface: provide a separate consume callback for hunks | Jeff King | 2018-11-02 | 1 | -10/+10 |
* | | Merge branch 'js/diff-notice-has-drive-prefix' | Junio C Hamano | 2018-10-30 | 1 | -2/+2 |
|\ \ | |||||
| * | | diff: don't attempt to strip prefix from absolute Windows paths | Johannes Sixt | 2018-10-22 | 1 | -2/+2 |
* | | | Merge branch 'sb/diff-emit-line-ws-markup-cleanup' | Junio C Hamano | 2018-10-26 | 1 | -7/+5 |
|\ \ \ | |||||
| * | | | diff.c: pass sign_index to emit_line_ws_markup | Stefan Beller | 2018-10-12 | 1 | -7/+5 |
* | | | | Merge branch 'pw/diff-color-moved-ws-fix' | Junio C Hamano | 2018-10-19 | 1 | -41/+54 |
|\ \ \ \ | |||||
| * | | | | diff --color-moved: fix a memory leak | Phillip Wood | 2018-10-05 | 1 | -2/+2 |
| * | | | | diff --color-moved-ws: fix another memory leak | Phillip Wood | 2018-10-05 | 1 | -0/+2 |
| * | | | | diff --color-moved-ws: fix a memory leak | Phillip Wood | 2018-10-05 | 1 | -1/+4 |
| * | | | | diff --color-moved-ws: fix out of bounds string access | Phillip Wood | 2018-10-05 | 1 | -1/+1 |
| * | | | | diff --color-moved-ws: fix double free crash | Phillip Wood | 2018-10-05 | 1 | -37/+45 |
| |/ / / | |||||
* | | | | Merge branch 'nd/the-index' | Junio C Hamano | 2018-10-19 | 1 | -113/+148 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | ws.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -3/+3 |
| * | | | userdiff.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -17/+23 |
| * | | | sha1-file.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -10/+10 |
| * | | | ll-merge.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -1/+1 |
| * | | | diff.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -2/+2 |
| * | | | diff.c: remove the_index dependency in textconv() functions | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -8/+9 |
| * | | | diff.c: reduce implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -74/+102 |
| | |/ | |/| | |||||
* | | | Merge branch 'sb/diff-color-move-more' | Junio C Hamano | 2018-09-24 | 1 | -5/+6 |
|\ \ \ | |||||
| * | | | diff: fix --color-moved-ws=allow-indentation-change | Phillip Wood | 2018-09-11 | 1 | -5/+6 |
* | | | | Merge branch 'jk/cocci' | Junio C Hamano | 2018-09-17 | 1 | -14/+9 |
|\ \ \ \ | |||||
| * | | | | show_dirstat: simplify same-content check | Jeff King | 2018-08-29 | 1 | -8/+3 |
| * | | | | convert "oidcmp() != 0" to "!oideq()" | Jeff King | 2018-08-29 | 1 | -3/+3 |
| * | | | | convert "oidcmp() == 0" to oideq() | Jeff King | 2018-08-29 | 1 | -3/+3 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'sb/range-diff-colors' | Junio C Hamano | 2018-09-17 | 1 | -41/+65 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | diff.c: add --output-indicator-{new, old, context} | Stefan Beller | 2018-08-20 | 1 | -3/+18 |
| * | | | diff.c: rewrite emit_line_0 more understandably | Stefan Beller | 2018-08-14 | 1 | -33/+40 |
| * | | | diff.c: omit check for line prefix in emit_line_0 | Stefan Beller | 2018-08-14 | 1 | -4/+1 |
| * | | | diff: use emit_line_0 once per line | Stefan Beller | 2018-08-14 | 1 | -8/+8 |
| * | | | diff.c: add set_sign to emit_line_0 | Stefan Beller | 2018-08-14 | 1 | -9/+15 |
| * | | | diff.c: reorder arguments for emit_line_ws_markup | Stefan Beller | 2018-08-14 | 1 | -6/+6 |
| * | | | diff.c: simplify caller of emit_line_0 | Stefan Beller | 2018-08-14 | 1 | -2/+1 |
* | | | | Merge branch 'js/range-diff' | Junio C Hamano | 2018-08-20 | 1 | -16/+89 |
|\| | | | |||||
| * | | | range-diff: use dim/bold cues to improve dual color mode | Johannes Schindelin | 2018-08-13 | 1 | -6/+22 |
| * | | | range-diff --dual-color: skip white-space warnings | Johannes Schindelin | 2018-08-13 | 1 | -0/+1 |
| * | | | diff: add an internal option to dual-color diffs of diffs | Johannes Schindelin | 2018-08-13 | 1 | -15/+68 |
| * | | | range-diff: suppress the diff headers | Johannes Schindelin | 2018-08-13 | 1 | -1/+4 |
* | | | | Merge branch 'nd/no-the-index' | Junio C Hamano | 2018-08-20 | 1 | -11/+1 |
|\ \ \ \ | |||||
| * | | | | convert.c: remove an implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-08-13 | 1 | -1/+1 |
| * | | | | diff.c: move read_index() code back to the caller | Nguyễn Thái Ngọc Duy | 2018-08-13 | 1 | -10/+0 |
| |/ / / | |||||
* | | | | Merge branch 'nd/i18n' | Junio C Hamano | 2018-08-16 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Update messages in preparation for i18n | Nguyễn Thái Ngọc Duy | 2018-07-23 | 1 | -2/+2 |
* | | | | | Merge branch 'es/diff-color-moved-fix' | Junio C Hamano | 2018-08-16 | 1 | -1/+3 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra" | Eric Sunshine | 2018-07-25 | 1 | -1/+3 |
| | |_|/ | |/| | |