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