aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* Merge branch 'cc/skip-to-optional-val'Junio C Hamano2017-12-28
|\
| * diff: use skip_to_optional_arg_default() in parsing --relativeJunio C Hamano2017-12-11
| * diff: use skip_to_optional_arg_default()Christian Couder2017-12-11
| * diff: use skip_to_optional_arg()Christian Couder2017-12-11
* | Merge branch 'ar/unconfuse-three-dots'Junio C Hamano2017-12-19
|\ \
| * | diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 valueAnn T Ropea2017-12-06
* | | Merge branch 'jt/diff-anchored-patience'Junio C Hamano2017-12-19
|\ \ \
| * | | diff: support anchoring line(s)Jonathan Tan2017-11-28
| | |/ | |/|
* | | Merge branch 'en/rename-progress'Junio C Hamano2017-12-19
|\ \ \ | |/ / |/| |
| * | diff: remove silent clamp of renameLimitElijah Newren2017-11-15
* | | Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano2017-11-27
|\ \ \ | |/ / |/| |
| * | diff: --ignore-cr-at-eolJunio C Hamano2017-11-08
| * | xdiff: reassign xpparm_t.flags bitsJunio C Hamano2017-10-27
* | | 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