summaryrefslogtreecommitdiffstats
path: root/diff.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/i18n'Junio C Hamano2018-08-161-2/+2
|\
| * Update messages in preparation for i18nNguyễn Thái Ngọc Duy2018-07-231-2/+2
* | Merge branch 'es/diff-color-moved-fix'Junio C Hamano2018-08-161-1/+3
|\ \
| * | diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"Eric Sunshine2018-07-251-1/+3
| * | Merge branch 'nd/diff-flush-before-warning' into maintJunio C Hamano2018-03-221-0/+1
| |\ \
| * \ \ Merge branch 'nd/ita-wt-renames-in-status' into maintJunio C Hamano2018-02-271-1/+1
| |\ \ \
* | \ \ \ Merge branch 'sb/diff-color-move-more'Junio C Hamano2018-08-031-26/+236
|\ \ \ \ \
| * | | | | diff.c: offer config option to control ws handling in move detectionStefan Beller2018-07-191-0/+9
| * | | | | diff.c: add white space mode to move detection that allows indent changesStefan Beller2018-07-191-2/+156
| * | | | | diff.c: factor advance_or_nullify out of mark_color_as_movedStefan Beller2018-07-171-12/+20
| * | | | | diff.c: decouple white space treatment from move detection algorithmStefan Beller2018-07-171-2/+37
| * | | | | diff.c: add a blocks mode for moved code detectionStefan Beller2018-07-171-2/+4
| * | | | | diff.c: adjust hash function signature to match hashmap expectationStefan Beller2018-07-171-7/+9
| * | | | | diff.c: do not pass diff options as keydata to hashmapStefan Beller2018-07-171-2/+2
* | | | | | Merge branch 'bc/object-id'Junio C Hamano2018-08-031-3/+3
|\ \ \ \ \ \
| * | | | | | diff: switch GIT_SHA1_HEXSZ to use the_hash_algobrian m. carlson2018-07-161-3/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-181-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | | | | | Merge branch 'nd/complete-config-vars'Junio C Hamano2018-06-251-32/+24
|\ \ \ \ \ \
| * | | | | | help: add --config to list all available configNguyễn Thái Ngọc Duy2018-05-291-0/+3
| * | | | | | Add and use generic name->id mapping code for color slot parsingNguyễn Thái Ngọc Duy2018-05-291-32/+21
| |/ / / / /
* | | | | | Merge branch 'bc/object-id'Junio C Hamano2018-05-301-7/+13
|\ \ \ \ \ \
| * | | | | | diff: specify abbreviation size in terms of the_hash_algobrian m. carlson2018-05-021-6/+12
| * | | | | | packfile: convert has_sha1_pack to object_idbrian m. carlson2018-05-021-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-301-6/+6
|\ \ \ \ \ \
| * | | | | | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-6/+6
| |/ / / / /
* | | | | | Merge branch 'bp/merge-rename-config'Junio C Hamano2018-05-301-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | merge: add merge.renames config settingBen Peart2018-05-081-1/+1
| |/ / / /
* / / / / cache.h: add repository argument to oid_object_infoStefan Beller2018-04-261-1/+2
|/ / / /
* | | | Merge branch 'bc/object-id'Junio C Hamano2018-04-101-3/+3
|\ \ \ \
| * | | | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-1/+1
| * | | | sha1_file: convert sha1_object_info* to object_idbrian m. carlson2018-03-141-1/+1
| * | | | Convert find_unique_abbrev* to struct object_idbrian m. carlson2018-03-141-1/+1
* | | | | Merge branch 'nd/diff-stat-with-summary'Junio C Hamano2018-03-141-33/+63
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | diff: add --compact-summaryNguyễn Thái Ngọc Duy2018-02-281-0/+37
| * | | | diff.c: refactor pprint_rename() to use strbufNguyễn Thái Ngọc Duy2018-02-021-33/+26
| |/ / /
* | | | Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-061-35/+35
|\ \ \ \
| * | | | diff: rename 'template' variablesBrandon Williams2018-02-221-5/+5
| * | | | diff: rename 'new' variablesBrandon Williams2018-02-221-22/+22
| * | | | diff: rename 'this' variablesBrandon Williams2018-02-221-8/+8
* | | | | Merge branch 'nd/diff-flush-before-warning'Junio C Hamano2018-02-131-0/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | diff.c: flush stdout before printing rename warningsNguyễn Thái Ngọc Duy2018-01-161-0/+1
| * | | | Merge branch 'tk/diffcore-delta-remove-unused' into maintJunio C Hamano2016-11-291-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/cocci' into maintJunio C Hamano2016-10-281-1/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'tb/crlf-conv-flags'Junio C Hamano2018-02-131-4/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | convert_to_git(): safe_crlf/checksafe becomes int conv_flagsTorsten Bögershausen2018-01-161-4/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sb/diff-blobfind-pickaxe'Junio C Hamano2018-01-231-13/+30
|\ \ \ \ \ \
| * | | | | | diff: use HAS_MULTI_BITS instead of counting bits manuallyStefan Beller2018-01-051-10/+5
| * | | | | | diff: properly error out when combining multiple pickaxe optionsStefan Beller2018-01-051-0/+3
| * | | | | | diffcore: add a pickaxe option to find a specific blobStefan Beller2018-01-051-1/+20