summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2018-08-15Merge branch 'es/diff-color-moved-fix'Junio C Hamano
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-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
2018-03-22Merge branch 'nd/diff-flush-before-warning' into maintJunio C Hamano
2018-03-14Merge branch 'nd/diff-stat-with-summary'Junio C Hamano
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson
2018-03-14sha1_file: convert sha1_object_info* to object_idbrian m. carlson
2018-03-14Convert find_unique_abbrev* to struct object_idbrian m. carlson
2018-03-06Merge branch 'bw/c-plus-plus'Junio C Hamano
2018-02-27diff: add --compact-summaryNguyễn Thái Ngọc Duy
2018-02-27Merge branch 'nd/ita-wt-renames-in-status' into maintJunio C Hamano
2018-02-22diff: rename 'template' variablesBrandon Williams
2018-02-22diff: rename 'new' variablesBrandon Williams
2018-02-22diff: rename 'this' variablesBrandon Williams
2018-02-13Merge branch 'nd/diff-flush-before-warning'Junio C Hamano
2018-02-13Merge branch 'tb/crlf-conv-flags'Junio C Hamano
2018-02-02diff.c: refactor pprint_rename() to use strbufNguyễn Thái Ngọc Duy
2018-01-23Merge branch 'sb/diff-blobfind-pickaxe'Junio C Hamano
2018-01-23Merge branch 'nd/ita-wt-renames-in-status'Junio C Hamano
2018-01-16diff.c: flush stdout before printing rename warningsNguyễn Thái Ngọc Duy
2018-01-16convert_to_git(): safe_crlf/checksafe becomes int conv_flagsTorsten Bögershausen
2018-01-04diff: use HAS_MULTI_BITS instead of counting bits manuallyStefan Beller
2018-01-04diff: properly error out when combining multiple pickaxe optionsStefan Beller
2018-01-04diffcore: add a pickaxe option to find a specific blobStefan Beller
2018-01-04diff: introduce DIFF_PICKAXE_KINDS_MASKStefan Beller
2017-12-28Merge branch 'cc/skip-to-optional-val'Junio C Hamano
2017-12-27Use DIFF_DETECT_RENAME for detect_rename assignmentsNguyễn Thái Ngọc Duy