summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | |_|_|/ |/| | |
| * | | combine-diff: speed it up, by using multiparent diff tree-walker directlyKirill Smelkov2014-04-071-0/+1
| * | | tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov2014-04-071-0/+1
* | | | Merge branch 'jk/external-diff-use-argv-array' (early part)Junio C Hamano2014-04-281-16/+16
|\ \ \ \ | | |/ / | |/| |
| * | | run_external_diff: use an argv_array for the command lineJeff King2014-04-211-16/+16
* | | | i18n: remove obsolete comments for translators in diffstat generationJiang Xin2014-04-171-8/+0
* | | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-081-1/+1
|\ \ \ \ | |/ / /
| * | | comments: fix misuses of "nor"Justin Lebar2014-03-311-1/+1
| * | | Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintJunio C Hamano2014-03-181-2/+3
| |\ \ \
| * \ \ \ Merge branch 'nd/diff-quiet-stat-dirty' into maintJunio C Hamano2014-03-181-24/+43
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge branch 'rm/strchrnul-not-strlen'Junio C Hamano2014-03-181-6/+3
|\ \ \ \ \
| * | | | | use strchrnul() in place of strchr() and strlen()rm/strchrnul-not-strlenRohit Mani2014-03-101-6/+3
| |/ / / /
* | | | | Merge branch 'dd/use-alloc-grow'Junio C Hamano2014-03-181-10/+2
|\ \ \ \ \
| * | | | | diff.c: use ALLOC_GROW()Dmitry S. Dolzhenko2014-03-031-10/+2
| |/ / / /
* | | | | Merge branch 'tr/diff-submodule-no-reuse-worktree'Junio C Hamano2014-03-141-2/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | diff: do not reuse_worktree_file for submodulestr/diff-submodule-no-reuse-worktreeThomas Rast2014-02-181-2/+3
* | | | | Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano2014-03-071-8/+0
|\ \ \ \ \
| * | | | | diff: remove "diff-files -q" in a version of Git in a distant futurejc/hold-diff-remove-q-synonym-for-no-deletionJunio C Hamano2013-07-191-8/+0
* | | | | | Merge branch 'nd/diff-quiet-stat-dirty'Junio C Hamano2014-02-271-24/+43
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | diff: do not quit early on stat-dirty filesnd/diff-quiet-stat-dirtyNguyễn Thái Ngọc Duy2014-02-241-5/+17
| * | | | diff.c: move diffcore_skip_stat_unmatch core logic out for reuse laterNguyễn Thái Ngọc Duy2014-02-241-21/+28
| | |/ / | |/| |
* | | | Merge branch 'jk/diff-filespec-cleanup'Junio C Hamano2014-01-271-2/+2
|\ \ \ \
| * | | | diff_filespec: drop xfrm_flags fieldJeff King2014-01-171-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'sb/diff-orderfile-config'Junio C Hamano2014-01-101-0/+5
|\ \ \ \
| * | | | diff: add diff.orderfile configuration variableSamuel Bronson2013-12-181-0/+5
* | | | | Merge branch 'zk/difftool-counts'Junio C Hamano2013-12-271-3/+17
|\ \ \ \ \
| * | | | | diff.c: fix some recent whitespace style violationszk/difftool-countsJeff King2013-12-161-2/+2
| * | | | | difftool: display the number of files in the diff queue in the promptZoltan Klinger2013-12-061-3/+17
| | |/ / / | |/| | |
View Lorry Controller Status