aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* 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
* | | | Sync with v2.5.4Junio C Hamano2015-09-28
|\ \ \ \ | |/ / / |/| | |
| * | | Sync with 2.4.10Junio C Hamano2015-09-28
| |\ \ \ | | | |/ | | |/|
| | * | Sync with 2.3.10Junio C Hamano2015-09-28
| | |\ \
| | | * | react to errors in xdi_diffJeff King2015-09-28
| | | * | Merge branch 'rs/deflate-init-cleanup' into maintJunio C Hamano2015-03-23
| | | |\ \
| | | * \ \ Merge branch 'mk/diff-shortstat-dirstat-fix' into maintJunio C Hamano2015-03-13
| | | |\ \ \
| | * | \ \ \ Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano2015-06-25
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge branch 'hv/submodule-config'Junio C Hamano2015-08-31
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule: use new config API for worktree configurationsHeiko Voigt2015-08-19
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mh/tempfile'Junio C Hamano2015-08-25
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | diff: use tempfile moduleMichael Haggerty2015-08-12
| |/ / / / / /
* | | | | | | Merge branch 'dt/log-follow-config'Junio C Hamano2015-08-03
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | log: add "log.follow" configuration variableDavid Turner2015-07-09
* | | | | | | Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano2015-07-15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | diff: parse ws-error-highlight option more strictlyRené Scharfe2015-07-12
* | | | | | | Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano2015-06-11
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTJeff King2015-05-27
| * | | | | | diff: accept color.diff.context as a synonym for "plain"Jeff King2015-05-27
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano2015-06-11
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | |
| * | | | diff.c: --ws-error-highlight=<kind> optionJunio C Hamano2015-05-26
| * | | | diff.c: add emit_del_line() and emit_context_line()Junio C Hamano2015-05-26
| |/ / /
* | | | Merge branch 'rs/deflate-init-cleanup'Junio C Hamano2015-03-17
|\ \ \ \ | | |_|/ | |/| |
| * | | zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}René Scharfe2015-03-05
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 17:17:45 +0000