Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/ignore-cr-at-eol' | Junio C Hamano | 2017-11-27 | 1 | -3/+3 |
|\ | |||||
| * | diff: --ignore-cr-at-eol | Junio C Hamano | 2017-11-08 | 1 | -0/+2 |
| * | xdiff: reassign xpparm_t.flags bits | Junio C Hamano | 2017-10-27 | 1 | -3/+1 |
* | | Merge branch 'bw/diff-opt-impl-to-bitfields' | Junio C Hamano | 2017-11-09 | 1 | -87/+88 |
|\ \ | |||||
| * | | diff: make struct diff_flags members lowercase | Brandon Williams | 2017-11-01 | 1 | -85/+85 |
| * | | diff: remove DIFF_OPT_CLR macro | Brandon Williams | 2017-11-01 | 1 | -14/+14 |
| * | | diff: remove DIFF_OPT_SET macro | Brandon Williams | 2017-11-01 | 1 | -33/+33 |
| * | | diff: remove DIFF_OPT_TST macro | Brandon Williams | 2017-11-01 | 1 | -38/+38 |
| * | | diff: add flag to indicate textconv was set via cmdline | Brandon Williams | 2017-11-01 | 1 | -2/+3 |
| * | | diff: convert flags to be stored in bitfields | Brandon Williams | 2017-11-01 | 1 | -1/+1 |
* | | | Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix' | Junio C Hamano | 2017-11-09 | 1 | -8/+6 |
|\ \ \ | |||||
| * | | | diff: fix lstat() error handling in diff_populate_filespec() | Andrey Okoshkin | 2017-10-29 | 1 | -8/+6 |
| | |/ | |/| | |||||
* | | | diff.c: get rid of duplicate implementation | Stefan Beller | 2017-10-26 | 1 | -78/+4 |
* | | | diff: handle NULs in get_string_hash() | Jeff King | 2017-10-21 | 1 | -1/+1 |
* | | | diff: fix whitespace-skipping with --color-moved | Jeff King | 2017-10-21 | 1 | -5/+10 |
| |/ |/| | |||||
* | | Merge branch 'jk/ref-filter-colors-fix' | Junio C Hamano | 2017-10-18 | 1 | -0/+3 |
|\ \ | |||||
| * | | Revert "color: check color.ui in git_default_config()" | Jeff King | 2017-10-17 | 1 | -0/+3 |
* | | | Merge branch 'sb/diff-color-move' | Junio C Hamano | 2017-10-17 | 1 | -13/+15 |
|\ \ \ | |||||
| * | | | diff: fix infinite loop with --color-moved --ignore-space-change | Jeff King | 2017-10-16 | 1 | -13/+15 |
* | | | | Merge branch 'sb/diff-color-move' | Junio C Hamano | 2017-10-03 | 1 | -0/+1 |
|\| | | | |||||
| * | | | diff: correct newline in summary for renamed files | Stefan Beller | 2017-09-28 | 1 | -0/+1 |
* | | | | Merge branch 'rj/no-sign-compare' | Junio C Hamano | 2017-09-29 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | ALLOC_GROW: avoid -Wsign-compare warnings | Ramsay Jones | 2017-09-22 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jk/write-in-full-fix' | Junio C Hamano | 2017-09-25 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | avoid "write_in_full(fd, buf, len) != len" pattern | Jeff King | 2017-09-14 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'rs/strbuf-leakfix' | Junio C Hamano | 2017-09-19 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | diff: release strbuf after use in show_stats() | Rene Scharfe | 2017-09-07 | 1 | -0/+1 |
| * | | | | diff: release strbuf after use in show_rename_copy() | Rene Scharfe | 2017-09-07 | 1 | -0/+1 |
| * | | | | diff: release strbuf after use in diff_summary() | Rene Scharfe | 2017-09-07 | 1 | -0/+1 |
* | | | | | tempfile: auto-allocate tempfiles on heap | Jeff King | 2017-09-06 | 1 | -8/+7 |
* | | | | | tempfile: do not delete tempfile on failed close | Jeff King | 2017-09-06 | 1 | -1/+1 |
* | | | | | always check return value of close_tempfile | Jeff King | 2017-09-06 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge branch 'jt/packmigrate' | Junio C Hamano | 2017-08-27 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | pack: move has_sha1_pack() | Jonathan Tan | 2017-08-24 | 1 | -0/+1 |
* | | | | | Merge branch 'bw/submodule-config-cleanup' | Junio C Hamano | 2017-08-27 | 1 | -3/+0 |
|\ \ \ \ \ | |||||
| * | | | | | diff: stop allowing diff to have submodules configured in .git/config | Brandon Williams | 2017-08-03 | 1 | -3/+0 |
* | | | | | | Merge branch 'po/object-id' | Junio C Hamano | 2017-08-27 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | sha1_file: convert index_path to struct object_id | Patryk Obara | 2017-08-21 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'jt/diff-color-move-fix' | Junio C Hamano | 2017-08-27 | 1 | -8/+39 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: define block by number of alphanumeric chars | Jonathan Tan | 2017-08-16 | 1 | -6/+22 |
| * | | | | | | diff: respect MIN_BLOCK_LENGTH for last block | Jonathan Tan | 2017-08-16 | 1 | -7/+22 |
| * | | | | | | diff: avoid redundantly clearing a flag | Jonathan Tan | 2017-08-14 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'sb/diff-color-move' | Junio C Hamano | 2017-08-27 | 1 | -252/+1057 |
|\| | | | | | |_|_|/ / |/| | | | | |||||
| * | | | | diff.c: add dimming to moved line detection | Stefan Beller | 2017-06-30 | 1 | -11/+121 |
| * | | | | diff.c: color moved lines differently, plain mode | Stefan Beller | 2017-06-30 | 1 | -2/+8 |
| * | | | | diff.c: color moved lines differently | Stefan Beller | 2017-06-30 | 1 | -14/+330 |
| * | | | | diff.c: buffer all output if asked to | Stefan Beller | 2017-06-30 | 1 | -2/+107 |
| * | | | | diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARY | Stefan Beller | 2017-06-30 | 1 | -30/+41 |
| * | | | | diff.c: emit_diff_symbol learns about DIFF_SYMBOL_STAT_SEP | Stefan Beller | 2017-06-30 | 1 | -3/+7 |
| * | | | | diff.c: convert word diffing to use emit_diff_symbol | Stefan Beller | 2017-06-30 | 1 | -33/+46 |