summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
2017-12-28Merge branch 'cc/skip-to-optional-val'Junio C Hamano-34/+16
2017-12-19Merge branch 'ar/unconfuse-three-dots'Junio C Hamano-1/+7
2017-12-19Merge branch 'jt/diff-anchored-patience'Junio C Hamano-2/+20
2017-12-19Merge branch 'en/rename-progress'Junio C Hamano-1/+1
2017-12-11diff: use skip_to_optional_arg_default() in parsing --relativeJunio C Hamano-4/+3
2017-12-11diff: use skip_to_optional_arg_default()Christian Couder-16/+4
2017-12-11diff: use skip_to_optional_arg()Christian Couder-14/+9
2017-12-06diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 valueAnn T Ropea-1/+7
2017-11-28diff: support anchoring line(s)Jonathan Tan-2/+20
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano-3/+3
2017-11-15diff: remove silent clamp of renameLimitElijah Newren-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano-87/+88
2017-11-09Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix'Junio C Hamano-8/+6
2017-11-08diff: --ignore-cr-at-eolJunio C Hamano-0/+2
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams-85/+85
2017-11-01diff: remove DIFF_OPT_CLR macroBrandon Williams-14/+14
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams-33/+33
2017-11-01diff: remove DIFF_OPT_TST macroBrandon Williams-38/+38
2017-11-01diff: add flag to indicate textconv was set via cmdlineBrandon Williams-2/+3
2017-11-01diff: convert flags to be stored in bitfieldsBrandon Williams-1/+1
2017-10-29diff: fix lstat() error handling in diff_populate_filespec()Andrey Okoshkin-8/+6
2017-10-27xdiff: reassign xpparm_t.flags bitsJunio C Hamano-3/+1
2017-10-26diff.c: get rid of duplicate implementationStefan Beller-78/+4
2017-10-21diff: handle NULs in get_string_hash()Jeff King-1/+1
2017-10-21diff: fix whitespace-skipping with --color-movedJeff King-5/+10
2017-10-18Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano-0/+3
2017-10-17Revert "color: check color.ui in git_default_config()"Jeff King-0/+3
2017-10-17Merge branch 'sb/diff-color-move'Junio C Hamano-13/+15
2017-10-16diff: fix infinite loop with --color-moved --ignore-space-changeJeff King-13/+15
2017-10-03Merge branch 'sb/diff-color-move'Junio C Hamano-0/+1
2017-09-29Merge branch 'rj/no-sign-compare'Junio C Hamano-1/+1
2017-09-28diff: correct newline in summary for renamed filesStefan Beller-0/+1
2017-09-25Merge branch 'jk/write-in-full-fix'Junio C Hamano-1/+1
2017-09-22ALLOC_GROW: avoid -Wsign-compare warningsRamsay Jones-1/+1
2017-09-19Merge branch 'rs/strbuf-leakfix'Junio C Hamano-0/+3
2017-09-14avoid "write_in_full(fd, buf, len) != len" patternJeff King-1/+1
2017-09-07diff: release strbuf after use in show_stats()Rene Scharfe-0/+1
2017-09-07diff: release strbuf after use in show_rename_copy()Rene Scharfe-0/+1
2017-09-07diff: release strbuf after use in diff_summary()Rene Scharfe-0/+1
2017-09-06tempfile: auto-allocate tempfiles on heapJeff King-8/+7
2017-09-06tempfile: do not delete tempfile on failed closeJeff King-1/+1
2017-09-06always check return value of close_tempfileJeff King-2/+2
2017-08-26Merge branch 'jt/packmigrate'Junio C Hamano-0/+1
2017-08-26Merge branch 'bw/submodule-config-cleanup'Junio C Hamano-3/+0
2017-08-26Merge branch 'po/object-id'Junio C Hamano-1/+1
2017-08-26Merge branch 'jt/diff-color-move-fix'Junio C Hamano-8/+39
2017-08-26Merge branch 'sb/diff-color-move'Junio C Hamano-252/+1057
2017-08-23pack: move has_sha1_pack()Jonathan Tan-0/+1
2017-08-20sha1_file: convert index_path to struct object_idPatryk Obara-1/+1
2017-08-17diff: retire sane_truncate_fnJunio C Hamano-5/+0