aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-09
|\
| * diff: make struct diff_flags members lowercaseBrandon Williams2017-11-01
| * diff: remove DIFF_OPT_CLR macroBrandon Williams2017-11-01
| * diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-01
| * diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-01
| * diff: add flag to indicate textconv was set via cmdlineBrandon Williams2017-11-01
| * diff: convert flags to be stored in bitfieldsBrandon Williams2017-11-01
* | Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix'Junio C Hamano2017-11-09
|\ \
| * | diff: fix lstat() error handling in diff_populate_filespec()Andrey Okoshkin2017-10-29
* | | diff.c: get rid of duplicate implementationStefan Beller2017-10-26
* | | diff: handle NULs in get_string_hash()Jeff King2017-10-21
* | | diff: fix whitespace-skipping with --color-movedJeff King2017-10-21
| |/ |/|
* | Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano2017-10-18
|\ \
| * | Revert "color: check color.ui in git_default_config()"Jeff King2017-10-17
* | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-10-17
|\ \ \
| * | | diff: fix infinite loop with --color-moved --ignore-space-changeJeff King2017-10-16
* | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-10-03
|\ \ \ \ | |/ / /
| * | | diff: correct newline in summary for renamed filesStefan Beller2017-09-28
* | | | Merge branch 'rj/no-sign-compare'Junio C Hamano2017-09-29
|\ \ \ \
| * | | | ALLOC_GROW: avoid -Wsign-compare warningsRamsay Jones2017-09-22
| | |/ / | |/| |
* | | | Merge branch 'jk/write-in-full-fix'Junio C Hamano2017-09-25
|\ \ \ \
| * | | | avoid "write_in_full(fd, buf, len) != len" patternJeff King2017-09-14
| |/ / /
* | | | Merge branch 'rs/strbuf-leakfix'Junio C Hamano2017-09-19
|\ \ \ \
| * | | | diff: release strbuf after use in show_stats()Rene Scharfe2017-09-07
| * | | | diff: release strbuf after use in show_rename_copy()Rene Scharfe2017-09-07
| * | | | diff: release strbuf after use in diff_summary()Rene Scharfe2017-09-07
* | | | | tempfile: auto-allocate tempfiles on heapJeff King2017-09-06
* | | | | tempfile: do not delete tempfile on failed closeJeff King2017-09-06
* | | | | always check return value of close_tempfileJeff King2017-09-06
|/ / / /
* | | | Merge branch 'jt/packmigrate'Junio C Hamano2017-08-26
|\ \ \ \
| * | | | pack: move has_sha1_pack()Jonathan Tan2017-08-23
* | | | | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-26
|\ \ \ \ \
| * | | | | diff: stop allowing diff to have submodules configured in .git/configBrandon Williams2017-08-03
* | | | | | Merge branch 'po/object-id'Junio C Hamano2017-08-26
|\ \ \ \ \ \
| * | | | | | sha1_file: convert index_path to struct object_idPatryk Obara2017-08-20
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jt/diff-color-move-fix'Junio C Hamano2017-08-26
|\ \ \ \ \ \
| * | | | | | diff: define block by number of alphanumeric charsJonathan Tan2017-08-16
| * | | | | | diff: respect MIN_BLOCK_LENGTH for last blockJonathan Tan2017-08-16
| * | | | | | diff: avoid redundantly clearing a flagJonathan Tan2017-08-14
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-08-26
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | diff.c: add dimming to moved line detectionStefan Beller2017-06-30
| * | | | diff.c: color moved lines differently, plain modeStefan Beller2017-06-30
| * | | | diff.c: color moved lines differentlyStefan Beller2017-06-30
| * | | | diff.c: buffer all output if asked toStefan Beller2017-06-30
| * | | | diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARYStefan Beller2017-06-30
| * | | | diff.c: emit_diff_symbol learns about DIFF_SYMBOL_STAT_SEPStefan Beller2017-06-30
| * | | | diff.c: convert word diffing to use emit_diff_symbolStefan Beller2017-06-30
| * | | | diff.c: convert show_stats to use emit_diff_symbolStefan Beller2017-06-30
| * | | | diff.c: convert emit_binary_diff_body to use emit_diff_symbolStefan Beller2017-06-30
| * | | | submodule.c: migrate diff output to use emit_diff_symbolStefan Beller2017-06-30