summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/swap'Junio C Hamano2017-02-151-8/+4
|\
| * diff: use SWAP macroRené Scharfe2017-01-301-3/+1
| * use SWAP macroRené Scharfe2017-01-301-5/+3
* | Merge branch 'jk/log-graph-name-only'Junio C Hamano2017-02-101-0/+1
|\ \
| * | diff: print line prefix for --name-only outputjk/log-graph-name-onlyJeff King2017-02-081-0/+1
| * | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maintJunio C Hamano2016-08-101-0/+7
| |\ \
* | | | use oid_to_hex_r() for converting struct object_id hashes to hex stringsRené Scharfe2017-01-301-1/+1
| |_|/ |/| |
* | | diff: add interhunk context config optionvn/diff-ihc-configVegard Nossum2017-01-121-0/+8
* | | Merge branch 'jc/retire-compaction-heuristics'Junio C Hamano2017-01-101-20/+3
|\ \ \
| * | | diff: retire "compaction" heuristicsjc/retire-compaction-heuristicsJunio C Hamano2016-12-231-20/+3
* | | | diff: handle --no-abbrev in no-index casejb/diff-no-index-no-abbrevJack Bates2016-12-081-1/+5
* | | | Merge branch 'tk/diffcore-delta-remove-unused'Junio C Hamano2016-11-171-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | diffcore-delta: remove unused parameter to diffcore_count_changes()tk/diffcore-delta-remove-unusedTobias Klauser2016-11-141-1/+1
* | | | Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-271-0/+4
|\ \ \ \
| * | | | diff: add --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy2016-10-241-0/+4
* | | | | Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano2016-10-271-16/+29
|\ \ \ \ \
| * | | | | diff: handle sha1 abbreviations outside of repositoryJeff King2016-10-261-4/+17
| * | | | | diff_aligned_abbrev: use "struct oid"Jeff King2016-10-261-9/+11
| * | | | | diff_unique_abbrev: rename to diff_aligned_abbrevJeff King2016-10-261-7/+3
* | | | | | Merge branch 'lt/abbrev-auto'Junio C Hamano2016-10-271-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | abbrev: prepare for new world orderJunio C Hamano2016-10-031-1/+1
* | | | | | Merge branch 'va/i18n'Junio C Hamano2016-10-261-7/+7
|\ \ \ \ \ \
| * | | | | | i18n: diff: mark warnings for translationva/i18nVasco Almeida2016-10-171-7/+7
* | | | | | | Merge branch 'jc/ws-error-highlight'Junio C Hamano2016-10-261-34/+55
|\ \ \ \ \ \ \
| * | | | | | | diff: introduce diff.wsErrorHighlight optionjc/ws-error-highlightJunio C Hamano2016-10-041-1/+10
| * | | | | | | diff.c: move ws-error-highlight parsing helpers upJunio C Hamano2016-10-041-37/+37
| * | | | | | | diff.c: refactor parse_ws_error_highlight()Junio C Hamano2016-10-041-5/+16
* | | | | | | | Merge branch 'jc/diff-unique-abbrev-comments'Junio C Hamano2016-10-261-1/+22
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | diff_unique_abbrev(): document its assumption and limitationjc/diff-unique-abbrev-commentsJunio C Hamano2016-09-301-1/+22
| * | | | | | | Merge branch 'js/regexec-buf' into maintJunio C Hamano2016-09-291-1/+2
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'rs/qsort'Junio C Hamano2016-10-101-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use QSORTRené Scharfe2016-09-291-3/+3
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/cocci'Junio C Hamano2016-10-061-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe2016-09-271-1/+1
* | | | | | | | | Merge branch 'js/regexec-buf'Junio C Hamano2016-09-261-1/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | regex: use regexec_buf()Johannes Schindelin2016-09-211-1/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'va/i18n-more'Junio C Hamano2016-09-261-5/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | i18n: i18n: diff: mark die messages for translationJean-Noël AVILA2016-09-211-5/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-261-7/+29
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | blame: honor the diff heuristic options and configMichael Haggerty2016-09-191-12/+17
| * | | | | | | diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-191-3/+20
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'bc/object-id'Junio C Hamano2016-09-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | cache: convert struct cache_entry to use struct object_idbrian m. carlson2016-09-071-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sb/diff-cleanup'Junio C Hamano2016-09-151-21/+10
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | diff: remove dead codesb/diff-cleanupStefan Beller2016-09-081-8/+0
| * | | | | | diff: omit found pointer from emit_callbackStefan Beller2016-09-081-4/+2
| * | | | | | diff.c: use diff_options directlyStefan Beller2016-09-081-11/+10
| |/ / / / /
* | | | | | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2016-09-121-17/+37
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | diff: teach diff to display submodule difference with an inline diffJacob Keller2016-08-311-9/+22
| * | | | | submodule: convert show_submodule_summary to use struct object_id *Jacob Keller2016-08-311-1/+1