summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Sync with v2.5.4Junio C Hamano2015-09-281-10/+16
|\
| * Sync with 2.4.10Junio C Hamano2015-09-281-10/+16
| |\
| | * Sync with 2.3.10Junio C Hamano2015-09-281-10/+16
| | |\
| | | * react to errors in xdi_diffJeff King2015-09-281-10/+16
| | | * Merge branch 'rs/deflate-init-cleanup' into maintJunio C Hamano2015-03-231-1/+0
| | | |\
| | | * \ Merge branch 'mk/diff-shortstat-dirstat-fix' into maintJunio C Hamano2015-03-131-1/+1
| | | |\ \
| | * | \ \ Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano2015-06-251-14/+14
| | |\ \ \ \
* | | \ \ \ \ Merge branch 'hv/submodule-config'Junio C Hamano2015-08-311-0/+1
|\ \ \ \ \ \ \
| * | | | | | | submodule: use new config API for worktree configurationsHeiko Voigt2015-08-191-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mh/tempfile'Junio C Hamano2015-08-251-23/+23
|\ \ \ \ \ \ \
| * | | | | | | diff: use tempfile moduleMichael Haggerty2015-08-121-23/+23
| |/ / / / / /
* | | | | | | Merge branch 'dt/log-follow-config'Junio C Hamano2015-08-031-2/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | log: add "log.follow" configuration variableDavid Turner2015-07-091-2/+3
* | | | | | | Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano2015-07-151-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | diff: parse ws-error-highlight option more strictlyjc/diff-ws-error-highlightRené Scharfe2015-07-121-1/+6
* | | | | | | Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano2015-06-111-15/+15
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-contextJeff King2015-05-271-13/+13
| * | | | | | diff: accept color.diff.context as a synonym for "plain"Jeff King2015-05-271-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano2015-06-111-22/+100
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | |
| * | | | diff.c: --ws-error-highlight=<kind> optionJunio C Hamano2015-05-261-16/+68
| * | | | diff.c: add emit_del_line() and emit_context_line()Junio C Hamano2015-05-261-12/+38
| |/ / /
* | | | Merge branch 'rs/deflate-init-cleanup'Junio C Hamano2015-03-171-1/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}rs/deflate-init-cleanupRené Scharfe2015-03-051-1/+0
* | | | Merge branch 'mk/diff-shortstat-dirstat-fix'Junio C Hamano2015-03-061-1/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | diff --shortstat --dirstat: remove duplicate outputmk/diff-shortstat-dirstat-fixMårten Kongstad2015-03-021-1/+1
| |/
| * Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano2014-07-221-1/+1
| |\
| * \ Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintJunio C Hamano2014-06-251-0/+3
| |\ \
* | \ \ Merge branch 'jn/parse-config-slot'Junio C Hamano2014-10-201-2/+1
|\ \ \ \
| * | | | color_parse: do not mention variable name in error messagejn/parse-config-slotJeff King2014-10-141-2/+1
* | | | | Merge branch 'nd/large-blobs'Junio C Hamano2014-09-111-14/+38
|\ \ \ \ \
| * | | | | diff: shortcut for diff'ing two binary SHA-1 objectsnd/large-blobsNguyễn Thái Ngọc Duy2014-08-181-0/+13
| * | | | | diff --stat: mark any file larger than core.bigfilethreshold binaryNguyễn Thái Ngọc Duy2014-08-181-8/+18
| * | | | | diff.c: allow to pass more flags to diff_populate_filespecNguyễn Thái Ngọc Duy2014-08-181-6/+7
| |/ / / /
* | | | | run-command: introduce CHILD_PROCESS_INITRené Scharfe2014-08-201-2/+1
|/ / / /
* | | | strbuf: use strbuf_addstr() for adding C stringsRené Scharfe2014-07-171-6/+6
* | | | stat_opt: check extra strlen callJeff King2014-06-201-1/+2
* | | | use skip_prefix to avoid repeating stringsJeff King2014-06-201-18/+9
* | | | use skip_prefix to avoid magic numbersJeff King2014-06-201-31/+34
* | | | parse_diff_color_slot: drop ofs parameterJeff King2014-06-181-10/+10
* | | | Merge branch 'bg/xcalloc-nmemb-then-size'Junio C Hamano2014-06-161-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | diff.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| |/ /
* | | Merge branch 'jk/diff-follow-must-take-one-pathspec'Junio C Hamano2014-06-161-0/+3
|\ \ \ | | |/ | |/|
| * | move "--follow needs one pathspec" rule to diff_setup_donejk/diff-follow-must-take-one-pathspecJeff King2014-05-201-0/+3
* | | Merge branch 'jk/external-diff-use-argv-array'Junio C Hamano2014-06-031-31/+25
|\ \ \
| * | | run_external_diff: refactor cmdline setup logicjk/external-diff-use-argv-arrayJeff King2014-04-211-11/+15
| * | | run_external_diff: hoist common bits out of conditionalJeff King2014-04-211-5/+3
| * | | run_external_diff: drop fflush(NULL)Jeff King2014-04-211-1/+0
| * | | run_external_diff: clean up error handlingJeff King2014-04-211-6/+3
| * | | run_external_diff: use an argv_array for the environmentJeff King2014-04-211-9/+5
* | | | Merge branch 'ks/tree-diff-nway'Junio C Hamano2014-06-031-0/+2
|\ \ \ \ | |_|_|/ |/| | |
View Lorry Controller Status