summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2018-06-25Merge branch 'nd/complete-config-vars'Libravatar Junio C Hamano1-32/+24
2018-05-30Merge branch 'bc/object-id'Libravatar Junio C Hamano1-7/+13
2018-05-30Merge branch 'js/use-bug-macro'Libravatar Junio C Hamano1-6/+6
2018-05-30Merge branch 'bp/merge-rename-config'Libravatar Junio C Hamano1-1/+1
2018-05-29help: add --config to list all available configLibravatar Nguyễn Thái Ngọc Duy1-0/+3
2018-05-29Add and use generic name->id mapping code for color slot parsingLibravatar Nguyễn Thái Ngọc Duy1-32/+21
2018-05-08merge: add merge.renames config settingLibravatar Ben Peart1-1/+1
2018-05-06Replace all die("BUG: ...") calls by BUG() onesLibravatar Johannes Schindelin1-6/+6
2018-05-02diff: specify abbreviation size in terms of the_hash_algoLibravatar brian m. carlson1-6/+12
2018-05-02packfile: convert has_sha1_pack to object_idLibravatar brian m. carlson1-1/+1
2018-04-26cache.h: add repository argument to oid_object_infoLibravatar Stefan Beller1-1/+2
2018-04-10Merge branch 'bc/object-id'Libravatar Junio C Hamano1-3/+3
2018-03-14Merge branch 'nd/diff-stat-with-summary'Libravatar Junio C Hamano1-33/+63
2018-03-14sha1_file: convert read_sha1_file to struct object_idLibravatar brian m. carlson1-1/+1
2018-03-14sha1_file: convert sha1_object_info* to object_idLibravatar brian m. carlson1-1/+1
2018-03-14Convert find_unique_abbrev* to struct object_idLibravatar brian m. carlson1-1/+1
2018-03-06Merge branch 'bw/c-plus-plus'Libravatar Junio C Hamano1-35/+35
2018-02-27diff: add --compact-summaryLibravatar Nguyễn Thái Ngọc Duy1-0/+37
2018-02-22diff: rename 'template' variablesLibravatar Brandon Williams1-5/+5
2018-02-22diff: rename 'new' variablesLibravatar Brandon Williams1-22/+22
2018-02-22diff: rename 'this' variablesLibravatar Brandon Williams1-8/+8
2018-02-13Merge branch 'nd/diff-flush-before-warning'Libravatar Junio C Hamano1-0/+1
2018-02-13Merge branch 'tb/crlf-conv-flags'Libravatar Junio C Hamano1-4/+4
2018-02-02diff.c: refactor pprint_rename() to use strbufLibravatar Nguyễn Thái Ngọc Duy1-33/+26
2018-01-23Merge branch 'sb/diff-blobfind-pickaxe'Libravatar Junio C Hamano1-13/+30
2018-01-23Merge branch 'nd/ita-wt-renames-in-status'Libravatar Junio C Hamano1-1/+1
2018-01-16diff.c: flush stdout before printing rename warningsLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2018-01-16convert_to_git(): safe_crlf/checksafe becomes int conv_flagsLibravatar Torsten Bögershausen1-4/+4
2018-01-04diff: use HAS_MULTI_BITS instead of counting bits manuallyLibravatar Stefan Beller1-10/+5
2018-01-04diff: properly error out when combining multiple pickaxe optionsLibravatar Stefan Beller1-0/+3
2018-01-04diffcore: add a pickaxe option to find a specific blobLibravatar Stefan Beller1-1/+20
2018-01-04diff: introduce DIFF_PICKAXE_KINDS_MASKLibravatar Stefan Beller1-2/+2
2017-12-28Merge branch 'cc/skip-to-optional-val'Libravatar Junio C Hamano1-34/+16
2017-12-27Use DIFF_DETECT_RENAME for detect_rename assignmentsLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2017-12-19Merge branch 'ar/unconfuse-three-dots'Libravatar Junio C Hamano1-1/+7
2017-12-19Merge branch 'jt/diff-anchored-patience'Libravatar Junio C Hamano1-2/+20
2017-12-19Merge branch 'en/rename-progress'Libravatar Junio C Hamano1-1/+1
2017-12-11diff: use skip_to_optional_arg_default() in parsing --relativeLibravatar Junio C Hamano1-4/+3
2017-12-11diff: use skip_to_optional_arg_default()Libravatar Christian Couder1-16/+4
2017-12-11diff: use skip_to_optional_arg()Libravatar Christian Couder1-14/+9
2017-12-06diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 valueLibravatar Ann T Ropea1-1/+7
2017-11-28diff: support anchoring line(s)Libravatar Jonathan Tan1-2/+20
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Libravatar Junio C Hamano1-3/+3
2017-11-15diff: remove silent clamp of renameLimitLibravatar Elijah Newren1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Libravatar Junio C Hamano1-87/+88
2017-11-09Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix'Libravatar Junio C Hamano1-8/+6
2017-11-08diff: --ignore-cr-at-eolLibravatar Junio C Hamano1-0/+2
2017-11-01diff: make struct diff_flags members lowercaseLibravatar Brandon Williams1-85/+85
2017-11-01diff: remove DIFF_OPT_CLR macroLibravatar Brandon Williams1-14/+14
2017-11-01diff: remove DIFF_OPT_SET macroLibravatar Brandon Williams1-33/+33