summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2018-08-13convert.c: remove an implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-08-13diff.c: move read_index() code back to the callerLibravatar Nguyễn Thái Ngọc Duy1-10/+0
2018-08-13range-diff: use dim/bold cues to improve dual color modeLibravatar Johannes Schindelin1-6/+22
2018-08-13range-diff --dual-color: skip white-space warningsLibravatar Johannes Schindelin1-0/+1
2018-08-13diff: add an internal option to dual-color diffs of diffsLibravatar Johannes Schindelin1-15/+68
2018-08-13range-diff: suppress the diff headersLibravatar Johannes Schindelin1-1/+4
2018-08-02Merge branch 'sb/diff-color-move-more'Libravatar Junio C Hamano1-26/+236
2018-08-02Merge branch 'bc/object-id'Libravatar Junio C Hamano1-3/+3
2018-07-25diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"Libravatar Eric Sunshine1-1/+3
2018-07-23Update messages in preparation for i18nLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2018-07-19diff.c: offer config option to control ws handling in move detectionLibravatar Stefan Beller1-0/+9
2018-07-19diff.c: add white space mode to move detection that allows indent changesLibravatar Stefan Beller1-2/+156
2018-07-18Merge branch 'sb/object-store-grafts'Libravatar Junio C Hamano1-0/+1
2018-07-17diff.c: factor advance_or_nullify out of mark_color_as_movedLibravatar Stefan Beller1-12/+20
2018-07-17diff.c: decouple white space treatment from move detection algorithmLibravatar Stefan Beller1-2/+37
2018-07-17diff.c: add a blocks mode for moved code detectionLibravatar Stefan Beller1-2/+4
2018-07-17diff.c: adjust hash function signature to match hashmap expectationLibravatar Stefan Beller1-7/+9
2018-07-17diff.c: do not pass diff options as keydata to hashmapLibravatar Stefan Beller1-2/+2
2018-07-16diff: switch GIT_SHA1_HEXSZ to use the_hash_algoLibravatar brian m. carlson1-3/+3
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-16object-store: move object access functions to object-store.hLibravatar Stefan Beller1-0/+1
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-22Merge branch 'nd/diff-flush-before-warning' into maintLibravatar Junio C Hamano1-0/+1
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-27Merge branch 'nd/ita-wt-renames-in-status' into maintLibravatar Junio C Hamano1-1/+1
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