summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/cocci'Junio C Hamano2018-09-171-14/+9
|\
| * show_dirstat: simplify same-content checkJeff King2018-08-291-8/+3
| * convert "oidcmp() != 0" to "!oideq()"Jeff King2018-08-291-3/+3
| * convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-3/+3
* | Merge branch 'sb/range-diff-colors'Junio C Hamano2018-09-171-41/+65
|\ \ | |/ |/|
| * diff.c: add --output-indicator-{new, old, context}Stefan Beller2018-08-201-3/+18
| * diff.c: rewrite emit_line_0 more understandablyStefan Beller2018-08-141-33/+40
| * diff.c: omit check for line prefix in emit_line_0Stefan Beller2018-08-141-4/+1
| * diff: use emit_line_0 once per lineStefan Beller2018-08-141-8/+8
| * diff.c: add set_sign to emit_line_0Stefan Beller2018-08-141-9/+15
| * diff.c: reorder arguments for emit_line_ws_markupStefan Beller2018-08-141-6/+6
| * diff.c: simplify caller of emit_line_0Stefan Beller2018-08-141-2/+1
* | Merge branch 'js/range-diff'Junio C Hamano2018-08-201-16/+89
|\ \ | |/
| * range-diff: use dim/bold cues to improve dual color modeJohannes Schindelin2018-08-131-6/+22
| * range-diff --dual-color: skip white-space warningsJohannes Schindelin2018-08-131-0/+1
| * diff: add an internal option to dual-color diffs of diffsJohannes Schindelin2018-08-131-15/+68
| * range-diff: suppress the diff headersJohannes Schindelin2018-08-131-1/+4
* | Merge branch 'nd/no-the-index'Junio C Hamano2018-08-201-11/+1
|\ \
| * | convert.c: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-08-131-1/+1
| * | diff.c: move read_index() code back to the callerNguyễn Thái Ngọc Duy2018-08-131-10/+0
| |/
* | Merge branch 'nd/i18n'Junio C Hamano2018-08-151-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-151-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-021-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-021-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
|\ \ \ \
View Lorry Controller Status