summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | diff: prepare for additional submodule formatsJacob Keller2016-08-311-6/+6
| * | | graph: add support for --line-prefix on all graph-aware outputJacob Keller2016-08-311-0/+7
| * | | diff.c: remove output_prefix_length fieldJunio C Hamano2016-08-311-1/+1
* | | | Merge branch 'kw/patch-ids-optim'Junio C Hamano2016-08-121-6/+10
|\ \ \ \ | |/ / / |/| | |
| * | | patch-ids: add flag to create the diff patch id using header only dataKevin Willford2016-07-291-6/+10
| |/ /
* | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'Junio C Hamano2016-08-031-0/+7
|\ \ \
| * | | diff: do not reuse worktree files that need "clean" conversionjk/diff-do-not-reuse-wtf-needs-cleaningJeff King2016-07-221-0/+7
| | |/ | |/|
* | | Merge branch 'bc/cocci'Junio C Hamano2016-07-191-46/+53
|\ \ \
| * | | diff: convert prep_temp_blob() to struct object_idbc/coccibrian m. carlson2016-06-281-4/+4
| * | | diff: rename struct diff_filespec's sha1_valid memberbrian m. carlson2016-06-281-14/+14
| * | | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-281-31/+38
| * | | coccinelle: convert hashcpy() with null_sha1 to hashclr()brian m. carlson2016-06-281-1/+1
| | |/ | |/|
* | | diff: do not color output when --color=auto and --output=<file> is givenJohannes Schindelin2016-06-281-0/+2
|/ /
* | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-06-101-1/+1
|\ \
| * | diff: disable compaction heuristic for nowjk/diff-compact-heuristicJunio C Hamano2016-06-101-1/+1
* | | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-05-061-0/+11
|\ \ \ | |/ /
| * | xdiff: implement empty line chunk heuristicStefan Beller2016-04-191-0/+11
* | | Merge branch 'mm/diff-renames-default'Junio C Hamano2016-04-031-0/+5
|\ \ \ | |_|/ |/| |
| * | diff: activate diff.renames by defaultmm/diff-renames-defaultMatthieu Moy2016-02-251-0/+5
* | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-261-13/+10
|\ \ \
| * | | diff_populate_gitlink: use a strbufJeff King2016-02-221-8/+8
| * | | convert trivial cases to FLEX_ARRAY macrosJeff King2016-02-221-5/+2
| * | | Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano2016-02-051-4/+10
| |\ \ \
* | \ \ \ Merge branch 'jk/more-comments-on-textconv'Junio C Hamano2016-02-261-1/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | diff: clarify textconv interfacejk/more-comments-on-textconvJeff King2016-02-221-1/+4
| | |_|/ | |/| |
* | | | Merge branch 'nd/diff-with-path-params'Junio C Hamano2016-02-031-4/+10
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | diff: make -O and --output work in subdirectorynd/diff-with-path-paramsDuy Nguyen2016-01-211-4/+10
* | | Merge branch 'tk/sigchain-unnecessary-post-tempfile'Junio C Hamano2015-10-291-1/+0
|\ \ \
| * | | diff: remove unused #include "sigchain.h"Tobias Klauser2015-10-221-1/+0
* | | | Merge branch 'jk/war-on-sprintf'Junio C Hamano2015-10-201-11/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | use sha1_to_hex_r() instead of strcpyJeff King2015-10-051-5/+4
| * | | convert trivial sprintf / strcpy calls to xsnprintfJeff King2015-09-251-6/+6
View Lorry Controller Status