summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
2018-08-20Merge branch 'js/range-diff'Junio C Hamano-16/+89
2018-08-20Merge branch 'nd/no-the-index'Junio C Hamano-11/+1
2018-08-15Merge branch 'nd/i18n'Junio C Hamano-2/+2
2018-08-15Merge branch 'es/diff-color-moved-fix'Junio C Hamano-1/+3
2018-08-13convert.c: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy-1/+1
2018-08-13diff.c: move read_index() code back to the callerNguyễn Thái Ngọc Duy-10/+0
2018-08-13range-diff: use dim/bold cues to improve dual color modeJohannes Schindelin-6/+22
2018-08-13range-diff --dual-color: skip white-space warningsJohannes Schindelin-0/+1
2018-08-13diff: add an internal option to dual-color diffs of diffsJohannes Schindelin-15/+68
2018-08-13range-diff: suppress the diff headersJohannes Schindelin-1/+4
2018-08-02Merge branch 'sb/diff-color-move-more'Junio C Hamano-26/+236
2018-08-02Merge branch 'bc/object-id'Junio C Hamano-3/+3
2018-07-25diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"Eric Sunshine-1/+3
2018-07-23Update messages in preparation for i18nNguyễn Thái Ngọc Duy-2/+2
2018-07-19diff.c: offer config option to control ws handling in move detectionStefan Beller-0/+9
2018-07-19diff.c: add white space mode to move detection that allows indent changesStefan Beller-2/+156
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano-0/+1
2018-07-17diff.c: factor advance_or_nullify out of mark_color_as_movedStefan Beller-12/+20
2018-07-17diff.c: decouple white space treatment from move detection algorithmStefan Beller-2/+37
2018-07-17diff.c: add a blocks mode for moved code detectionStefan Beller-2/+4
2018-07-17diff.c: adjust hash function signature to match hashmap expectationStefan Beller-7/+9
2018-07-17diff.c: do not pass diff options as keydata to hashmapStefan Beller-2/+2
2018-07-16diff: switch GIT_SHA1_HEXSZ to use the_hash_algobrian m. carlson-3/+3
2018-06-25Merge branch 'nd/complete-config-vars'Junio C Hamano-32/+24
2018-05-30Merge branch 'bc/object-id'Junio C Hamano-7/+13
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano-6/+6
2018-05-30Merge branch 'bp/merge-rename-config'Junio C Hamano-1/+1
2018-05-29help: add --config to list all available configNguyễn Thái Ngọc Duy-0/+3
2018-05-29Add and use generic name->id mapping code for color slot parsingNguyễn Thái Ngọc Duy-32/+21
2018-05-16object-store: move object access functions to object-store.hStefan Beller-0/+1
2018-05-08merge: add merge.renames config settingBen Peart-1/+1
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin-6/+6
2018-05-02diff: specify abbreviation size in terms of the_hash_algobrian m. carlson-6/+12
2018-05-02packfile: convert has_sha1_pack to object_idbrian m. carlson-1/+1
2018-04-26cache.h: add repository argument to oid_object_infoStefan Beller-1/+2
2018-04-10Merge branch 'bc/object-id'Junio C Hamano-3/+3
2018-03-22Merge branch 'nd/diff-flush-before-warning' into maintJunio C Hamano-0/+1
2018-03-14Merge branch 'nd/diff-stat-with-summary'Junio C Hamano-33/+63
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson-1/+1
2018-03-14sha1_file: convert sha1_object_info* to object_idbrian m. carlson-1/+1
2018-03-14Convert find_unique_abbrev* to struct object_idbrian m. carlson-1/+1
2018-03-06Merge branch 'bw/c-plus-plus'Junio C Hamano-35/+35
2018-02-27diff: add --compact-summaryNguyễn Thái Ngọc Duy-0/+37
2018-02-27Merge branch 'nd/ita-wt-renames-in-status' into maintJunio C Hamano-1/+1
2018-02-22diff: rename 'template' variablesBrandon Williams-5/+5
2018-02-22diff: rename 'new' variablesBrandon Williams-22/+22
2018-02-22diff: rename 'this' variablesBrandon Williams-8/+8
2018-02-13Merge branch 'nd/diff-flush-before-warning'Junio C Hamano-0/+1
2018-02-13Merge branch 'tb/crlf-conv-flags'Junio C Hamano-4/+4
2018-02-02diff.c: refactor pprint_rename() to use strbufNguyễn Thái Ngọc Duy-33/+26