aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* 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
* | | Merge branch 'mm/diff-renames-default'Junio C Hamano2016-04-03
|\ \ \ | |_|/ |/| |
| * | diff: activate diff.renames by defaultMatthieu Moy2016-02-25
* | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-26
|\ \ \
| * | | diff_populate_gitlink: use a strbufJeff King2016-02-22
| * | | convert trivial cases to FLEX_ARRAY macrosJeff King2016-02-22
| * | | Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano2016-02-05
| |\ \ \
* | \ \ \ Merge branch 'jk/more-comments-on-textconv'Junio C Hamano2016-02-26
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | diff: clarify textconv interfaceJeff King2016-02-22
| | |_|/ | |/| |
* | | | Merge branch 'nd/diff-with-path-params'Junio C Hamano2016-02-03
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | diff: make -O and --output work in subdirectoryDuy Nguyen2016-01-21
* | | Merge branch 'tk/sigchain-unnecessary-post-tempfile'Junio C Hamano2015-10-29
|\ \ \
| * | | diff: remove unused #include "sigchain.h"Tobias Klauser2015-10-22
* | | | Merge branch 'jk/war-on-sprintf'Junio C Hamano2015-10-20
|\ \ \ \ | |_|/ / |/| | |
| * | | use sha1_to_hex_r() instead of strcpyJeff King2015-10-05
| * | | convert trivial sprintf / strcpy calls to xsnprintfJeff King2015-09-25