summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2018-09-24Merge branch 'sb/diff-color-move-more'Junio C Hamano
2018-09-17Merge branch 'jk/cocci'Junio C Hamano
2018-09-17Merge branch 'sb/range-diff-colors'Junio C Hamano
2018-09-11diff: fix --color-moved-ws=allow-indentation-changePhillip Wood
2018-08-29show_dirstat: simplify same-content checkJeff King
2018-08-29convert "oidcmp() != 0" to "!oideq()"Jeff King
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King
2018-08-20diff.c: add --output-indicator-{new, old, context}Stefan Beller
2018-08-20Merge branch 'js/range-diff'Junio C Hamano
2018-08-20Merge branch 'nd/no-the-index'Junio C Hamano
2018-08-15Merge branch 'nd/i18n'Junio C Hamano
2018-08-15Merge branch 'es/diff-color-moved-fix'Junio C Hamano
2018-08-14diff.c: rewrite emit_line_0 more understandablyStefan Beller
2018-08-14diff.c: omit check for line prefix in emit_line_0Stefan Beller
2018-08-14diff: use emit_line_0 once per lineStefan Beller
2018-08-14diff.c: add set_sign to emit_line_0Stefan Beller
2018-08-14diff.c: reorder arguments for emit_line_ws_markupStefan Beller
2018-08-14diff.c: simplify caller of emit_line_0Stefan Beller
2018-08-13convert.c: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-08-13diff.c: move read_index() code back to the callerNguyễn Thái Ngọc Duy
2018-08-13range-diff: use dim/bold cues to improve dual color modeJohannes Schindelin
2018-08-13range-diff --dual-color: skip white-space warningsJohannes Schindelin
2018-08-13diff: add an internal option to dual-color diffs of diffsJohannes Schindelin
2018-08-13range-diff: suppress the diff headersJohannes Schindelin
2018-08-02Merge branch 'sb/diff-color-move-more'Junio C Hamano
2018-08-02Merge branch 'bc/object-id'Junio C Hamano
2018-07-25diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"Eric Sunshine
2018-07-23Update messages in preparation for i18nNguyễn Thái Ngọc Duy
2018-07-19diff.c: offer config option to control ws handling in move detectionStefan Beller
2018-07-19diff.c: add white space mode to move detection that allows indent changesStefan Beller
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano
2018-07-17diff.c: factor advance_or_nullify out of mark_color_as_movedStefan Beller
2018-07-17diff.c: decouple white space treatment from move detection algorithmStefan Beller
2018-07-17diff.c: add a blocks mode for moved code detectionStefan Beller
2018-07-17diff.c: adjust hash function signature to match hashmap expectationStefan Beller
2018-07-17diff.c: do not pass diff options as keydata to hashmapStefan Beller
2018-07-16diff: switch GIT_SHA1_HEXSZ to use the_hash_algobrian m. carlson
2018-06-25Merge branch 'nd/complete-config-vars'Junio C Hamano
2018-05-30Merge branch 'bc/object-id'Junio C Hamano
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano
2018-05-30Merge branch 'bp/merge-rename-config'Junio C Hamano
2018-05-29help: add --config to list all available configNguyễn Thái Ngọc Duy
2018-05-29Add and use generic name->id mapping code for color slot parsingNguyễn Thái Ngọc Duy
2018-05-16object-store: move object access functions to object-store.hStefan Beller
2018-05-08merge: add merge.renames config settingBen Peart
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin
2018-05-02diff: specify abbreviation size in terms of the_hash_algobrian m. carlson
2018-05-02packfile: convert has_sha1_pack to object_idbrian m. carlson
2018-04-26cache.h: add repository argument to oid_object_infoStefan Beller
2018-04-09Merge branch 'bc/object-id'Junio C Hamano