aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* 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
* | | | Merge branch 'mk/diff-shortstat-dirstat-fix'Junio C Hamano2015-03-06
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | diff --shortstat --dirstat: remove duplicate outputMårten Kongstad2015-03-02
| |/
| * Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano2014-07-22
| |\
| * \ Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintJunio C Hamano2014-06-25
| |\ \
* | \ \ Merge branch 'jn/parse-config-slot'Junio C Hamano2014-10-20
|\ \ \ \
| * | | | color_parse: do not mention variable name in error messageJeff King2014-10-14
* | | | | Merge branch 'nd/large-blobs'Junio C Hamano2014-09-11
|\ \ \ \ \
| * | | | | diff: shortcut for diff'ing two binary SHA-1 objectsNguyễn Thái Ngọc Duy2014-08-18
| * | | | | diff --stat: mark any file larger than core.bigfilethreshold binaryNguyễn Thái Ngọc Duy2014-08-18
| * | | | | diff.c: allow to pass more flags to diff_populate_filespecNguyễn Thái Ngọc Duy2014-08-18
| |/ / / /
* | | | | run-command: introduce CHILD_PROCESS_INITRené Scharfe2014-08-20
|/ / / /
* | | | strbuf: use strbuf_addstr() for adding C stringsRené Scharfe2014-07-17
* | | | stat_opt: check extra strlen callJeff King2014-06-20
* | | | use skip_prefix to avoid repeating stringsJeff King2014-06-20
* | | | use skip_prefix to avoid magic numbersJeff King2014-06-20
* | | | parse_diff_color_slot: drop ofs parameterJeff King2014-06-18
* | | | Merge branch 'bg/xcalloc-nmemb-then-size'Junio C Hamano2014-06-16
|\ \ \ \ | | |_|/ | |/| |
| * | | diff.c: rearrange xcalloc argumentsBrian Gesiak2014-05-27
| |/ /
* | | Merge branch 'jk/diff-follow-must-take-one-pathspec'Junio C Hamano2014-06-16
|\ \ \ | | |/ | |/|
| * | move "--follow needs one pathspec" rule to diff_setup_doneJeff King2014-05-20
* | | Merge branch 'jk/external-diff-use-argv-array'Junio C Hamano2014-06-03
|\ \ \
| * | | run_external_diff: refactor cmdline setup logicJeff King2014-04-21
| * | | run_external_diff: hoist common bits out of conditionalJeff King2014-04-21
| * | | run_external_diff: drop fflush(NULL)Jeff King2014-04-21
| * | | run_external_diff: clean up error handlingJeff King2014-04-21
| * | | run_external_diff: use an argv_array for the environmentJeff King2014-04-21
* | | | Merge branch 'ks/tree-diff-nway'Junio C Hamano2014-06-03
|\ \ \ \ | |_|_|/ |/| | |
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 00:49:18 +0000