summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/diff-stat-with-summary'Junio C Hamano2018-03-141-33/+63
|\
| * diff: add --compact-summarynd/diff-stat-with-summaryNguyễn Thái Ngọc Duy2018-02-271-0/+37
| * diff.c: refactor pprint_rename() to use strbufNguyễn Thái Ngọc Duy2018-02-021-33/+26
* | Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-061-35/+35
|\ \
| * | diff: rename 'template' variablesBrandon Williams2018-02-221-5/+5
| * | diff: rename 'new' variablesBrandon Williams2018-02-221-22/+22
| * | diff: rename 'this' variablesBrandon Williams2018-02-221-8/+8
* | | Merge branch 'nd/diff-flush-before-warning'Junio C Hamano2018-02-131-0/+1
|\ \ \
| * | | diff.c: flush stdout before printing rename warningsnd/diff-flush-before-warningNguyễn Thái Ngọc Duy2018-01-161-0/+1
| * | | Merge branch 'tk/diffcore-delta-remove-unused' into maintJunio C Hamano2016-11-291-1/+1
| |\ \ \
| * \ \ \ Merge branch 'rs/cocci' into maintJunio C Hamano2016-10-281-1/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'tb/crlf-conv-flags'Junio C Hamano2018-02-131-4/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | convert_to_git(): safe_crlf/checksafe becomes int conv_flagstb/crlf-conv-flagsTorsten Bögershausen2018-01-161-4/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sb/diff-blobfind-pickaxe'Junio C Hamano2018-01-231-13/+30
|\ \ \ \ \
| * | | | | diff: use HAS_MULTI_BITS instead of counting bits manuallysb/diff-blobfind-pickaxeStefan Beller2018-01-041-10/+5
| * | | | | diff: properly error out when combining multiple pickaxe optionsStefan Beller2018-01-041-0/+3
| * | | | | diffcore: add a pickaxe option to find a specific blobStefan Beller2018-01-041-1/+20
| * | | | | diff: introduce DIFF_PICKAXE_KINDS_MASKStefan Beller2018-01-041-2/+2
* | | | | | Merge branch 'nd/ita-wt-renames-in-status'Junio C Hamano2018-01-231-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use DIFF_DETECT_RENAME for detect_rename assignmentsNguyễn Thái Ngọc Duy2017-12-271-1/+1
* | | | | | 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)jt/diff-anchored-patienceJonathan 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-eoljc/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 lowercasebw/diff-opt-impl-to-bitfieldsBrandon 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()ao/diff-populate-filespec-lstat-errorpath-fixAndrey Okoshkin2017-10-291-8/+6
| | |/ / / / | |/| | | |
* | | | | | diff.c: get rid of duplicate implementationsb/diff-color-moved-use-xdl-recmatchStefan Beller2017-10-261-78/+4
* | | | | | diff: handle NULs in get_string_hash()jk/diff-color-moved-fixJeff 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-changesb/diff-color-moveJeff King2017-10-161-13/+15
* | | | | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-10-031-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
View Lorry Controller Status