summaryrefslogtreecommitdiffstats
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/skip-to-optional-val'Junio C Hamano2017-12-281-34/+16
|\
| * diff: use skip_to_optional_arg_default() in parsing --relativeJunio C Hamano2017-12-111-4/+3
| * diff: use skip_to_optional_arg_default()Christian Couder2017-12-111-16/+4
| * diff: use skip_to_optional_arg()Christian Couder2017-12-111-14/+9
* | Merge branch 'ar/unconfuse-three-dots'Junio C Hamano2017-12-191-1/+7
|\ \
| * | diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 valueAnn T Ropea2017-12-061-1/+7
* | | Merge branch 'jt/diff-anchored-patience'Junio C Hamano2017-12-191-2/+20
|\ \ \
| * | | diff: support anchoring line(s)Jonathan Tan2017-11-281-2/+20
| | |/ | |/|
* | | Merge branch 'en/rename-progress'Junio C Hamano2017-12-191-1/+1
|\ \ \ | |/ / |/| |
| * | diff: remove silent clamp of renameLimitElijah Newren2017-11-151-1/+1
* | | Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano2017-11-271-3/+3
|\ \ \ | |/ / |/| |
| * | diff: --ignore-cr-at-eolJunio C Hamano2017-11-081-0/+2
| * | xdiff: reassign xpparm_t.flags bitsJunio C Hamano2017-10-271-3/+1
* | | Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-87/+88
|\ \ \
| * | | diff: make struct diff_flags members lowercaseBrandon Williams2017-11-011-85/+85
| * | | diff: remove DIFF_OPT_CLR macroBrandon Williams2017-11-011-14/+14
| * | | diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-33/+33
| * | | diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-011-38/+38
| * | | diff: add flag to indicate textconv was set via cmdlineBrandon Williams2017-11-011-2/+3
| * | | diff: convert flags to be stored in bitfieldsBrandon Williams2017-11-011-1/+1
* | | | Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix'Junio C Hamano2017-11-091-8/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | diff: fix lstat() error handling in diff_populate_filespec()Andrey Okoshkin2017-10-291-8/+6
| | |/ | |/|
* | | diff.c: get rid of duplicate implementationStefan Beller2017-10-261-78/+4
* | | diff: handle NULs in get_string_hash()Jeff King2017-10-211-1/+1
* | | diff: fix whitespace-skipping with --color-movedJeff King2017-10-211-5/+10
| |/ |/|
* | Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano2017-10-181-0/+3
|\ \
| * | Revert "color: check color.ui in git_default_config()"Jeff King2017-10-171-0/+3
* | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-10-171-13/+15
|\ \ \
| * | | diff: fix infinite loop with --color-moved --ignore-space-changeJeff King2017-10-161-13/+15
* | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-10-031-0/+1
|\| | |
| * | | diff: correct newline in summary for renamed filesStefan Beller2017-09-281-0/+1
* | | | Merge branch 'rj/no-sign-compare'Junio C Hamano2017-09-291-1/+1
|\ \ \ \
| * | | | ALLOC_GROW: avoid -Wsign-compare warningsRamsay Jones2017-09-221-1/+1
| | |/ / | |/| |
* | | | Merge branch 'jk/write-in-full-fix'Junio C Hamano2017-09-251-1/+1
|\ \ \ \
| * | | | avoid "write_in_full(fd, buf, len) != len" patternJeff King2017-09-141-1/+1
| |/ / /
* | | | Merge branch 'rs/strbuf-leakfix'Junio C Hamano2017-09-191-0/+3
|\ \ \ \
| * | | | diff: release strbuf after use in show_stats()Rene Scharfe2017-09-071-0/+1
| * | | | diff: release strbuf after use in show_rename_copy()Rene Scharfe2017-09-071-0/+1
| * | | | diff: release strbuf after use in diff_summary()Rene Scharfe2017-09-071-0/+1
* | | | | tempfile: auto-allocate tempfiles on heapJeff King2017-09-061-8/+7
* | | | | tempfile: do not delete tempfile on failed closeJeff King2017-09-061-1/+1
* | | | | always check return value of close_tempfileJeff King2017-09-061-2/+2
|/ / / /
* | | | Merge branch 'jt/packmigrate'Junio C Hamano2017-08-261-0/+1
|\ \ \ \
| * | | | pack: move has_sha1_pack()Jonathan Tan2017-08-231-0/+1
* | | | | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-261-3/+0
|\ \ \ \ \
| * | | | | diff: stop allowing diff to have submodules configured in .git/configBrandon Williams2017-08-031-3/+0
* | | | | | Merge branch 'po/object-id'Junio C Hamano2017-08-261-1/+1
|\ \ \ \ \ \
| * | | | | | sha1_file: convert index_path to struct object_idPatryk Obara2017-08-201-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jt/diff-color-move-fix'Junio C Hamano2017-08-261-8/+39
|\ \ \ \ \ \
| * | | | | | diff: define block by number of alphanumeric charsJonathan Tan2017-08-161-6/+22