aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
...
| * | | | | diff_aligned_abbrev: use "struct oid"Jeff King2016-10-26
| * | | | | diff_unique_abbrev: rename to diff_aligned_abbrevJeff King2016-10-26
* | | | | | Merge branch 'lt/abbrev-auto'Junio C Hamano2016-10-27
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | abbrev: prepare for new world orderJunio C Hamano2016-10-03
* | | | | | Merge branch 'va/i18n'Junio C Hamano2016-10-26
|\ \ \ \ \ \
| * | | | | | i18n: diff: mark warnings for translationVasco Almeida2016-10-17
* | | | | | | Merge branch 'jc/ws-error-highlight'Junio C Hamano2016-10-26
|\ \ \ \ \ \ \
| * | | | | | | diff: introduce diff.wsErrorHighlight optionJunio C Hamano2016-10-04
| * | | | | | | diff.c: move ws-error-highlight parsing helpers upJunio C Hamano2016-10-04
| * | | | | | | diff.c: refactor parse_ws_error_highlight()Junio C Hamano2016-10-04
* | | | | | | | Merge branch 'jc/diff-unique-abbrev-comments'Junio C Hamano2016-10-26
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | diff_unique_abbrev(): document its assumption and limitationJunio C Hamano2016-09-30
| * | | | | | | Merge branch 'js/regexec-buf' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'rs/qsort'Junio C Hamano2016-10-10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use QSORTRené Scharfe2016-09-29
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/cocci'Junio C Hamano2016-10-06
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe2016-09-27
* | | | | | | | | Merge branch 'js/regexec-buf'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | regex: use regexec_buf()Johannes Schindelin2016-09-21
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'va/i18n-more'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \ \
| * | | | | | | | i18n: i18n: diff: mark die messages for translationJean-Noël AVILA2016-09-21
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | blame: honor the diff heuristic options and configMichael Haggerty2016-09-19
| * | | | | | | diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-19
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'bc/object-id'Junio C Hamano2016-09-19
|\ \ \ \ \ \ \
| * | | | | | | cache: convert struct cache_entry to use struct object_idbrian m. carlson2016-09-07
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sb/diff-cleanup'Junio C Hamano2016-09-15
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | diff: remove dead codeStefan Beller2016-09-08
| * | | | | | diff: omit found pointer from emit_callbackStefan Beller2016-09-08
| * | | | | | diff.c: use diff_options directlyStefan Beller2016-09-08
| |/ / / / /
* | | | | | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2016-09-12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | diff: teach diff to display submodule difference with an inline diffJacob Keller2016-08-31
| * | | | | submodule: convert show_submodule_summary to use struct object_id *Jacob Keller2016-08-31
| * | | | | diff: prepare for additional submodule formatsJacob Keller2016-08-31
| * | | | | graph: add support for --line-prefix on all graph-aware outputJacob Keller2016-08-31
| * | | | | diff.c: remove output_prefix_length fieldJunio C Hamano2016-08-31
* | | | | | Merge branch 'kw/patch-ids-optim'Junio C Hamano2016-08-12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | patch-ids: add flag to create the diff patch id using header only dataKevin Willford2016-07-29
| |/ / / /
* | | | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'Junio C Hamano2016-08-03
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | diff: do not reuse worktree files that need "clean" conversionJeff King2016-07-22
| | |/ / | |/| |
* | | | Merge branch 'bc/cocci'Junio C Hamano2016-07-19
|\ \ \ \
| * | | | diff: convert prep_temp_blob() to struct object_idbrian m. carlson2016-06-28
| * | | | diff: rename struct diff_filespec's sha1_valid memberbrian m. carlson2016-06-28
| * | | | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-28
| * | | | coccinelle: convert hashcpy() with null_sha1 to hashclr()brian m. carlson2016-06-28
| | |/ / | |/| |
* | | | diff: do not color output when --color=auto and --output=<file> is givenJohannes Schindelin2016-06-28
|/ / /
* | | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-06-10
|\ \ \
| * | | diff: disable compaction heuristic for nowJunio C Hamano2016-06-10
* | | | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-05-06
|\ \ \ \ | |/ / /
| * | | xdiff: implement empty line chunk heuristicStefan Beller2016-04-19