aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* 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
|\ \ \ \ | |_|_|/ |/| | |
| * | | combine-diff: speed it up, by using multiparent diff tree-walker directlyKirill Smelkov2014-04-07
| * | | tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov2014-04-07
* | | | Merge branch 'jk/external-diff-use-argv-array' (early part)Junio C Hamano2014-04-28
|\ \ \ \ | | |/ / | |/| |
| * | | run_external_diff: use an argv_array for the command lineJeff King2014-04-21
* | | | i18n: remove obsolete comments for translators in diffstat generationJiang Xin2014-04-17
* | | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-08
|\ \ \ \ | |/ / /
| * | | comments: fix misuses of "nor"Justin Lebar2014-03-31
| * | | Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintJunio C Hamano2014-03-18
| |\ \ \
| * \ \ \ Merge branch 'nd/diff-quiet-stat-dirty' into maintJunio C Hamano2014-03-18
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge branch 'rm/strchrnul-not-strlen'Junio C Hamano2014-03-18
|\ \ \ \ \
| * | | | | use strchrnul() in place of strchr() and strlen()Rohit Mani2014-03-10
| |/ / / /
* | | | | Merge branch 'dd/use-alloc-grow'Junio C Hamano2014-03-18
|\ \ \ \ \
| * | | | | diff.c: use ALLOC_GROW()Dmitry S. Dolzhenko2014-03-03
| |/ / / /
* | | | | Merge branch 'tr/diff-submodule-no-reuse-worktree'Junio C Hamano2014-03-14
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | diff: do not reuse_worktree_file for submodulesThomas Rast2014-02-18
* | | | | Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano2014-03-07
|\ \ \ \ \
| * | | | | diff: remove "diff-files -q" in a version of Git in a distant futureJunio C Hamano2013-07-19
* | | | | | Merge branch 'nd/diff-quiet-stat-dirty'Junio C Hamano2014-02-27
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | diff: do not quit early on stat-dirty filesNguyễn Thái Ngọc Duy2014-02-24
| * | | | diff.c: move diffcore_skip_stat_unmatch core logic out for reuse laterNguyễn Thái Ngọc Duy2014-02-24
| | |/ / | |/| |
* | | | Merge branch 'jk/diff-filespec-cleanup'Junio C Hamano2014-01-27
|\ \ \ \
| * | | | diff_filespec: drop xfrm_flags fieldJeff King2014-01-17
| | |_|/ | |/| |
* | | | Merge branch 'sb/diff-orderfile-config'Junio C Hamano2014-01-10
|\ \ \ \
| * | | | diff: add diff.orderfile configuration variableSamuel Bronson2013-12-18
* | | | | Merge branch 'zk/difftool-counts'Junio C Hamano2013-12-27
|\ \ \ \ \
| * | | | | diff.c: fix some recent whitespace style violationsJeff King2013-12-16
| * | | | | difftool: display the number of files in the diff queue in the promptZoltan Klinger2013-12-06
| | |/ / / | |/| | |
* | | | | Merge branch 'cc/starts-n-ends-with'Junio C Hamano2013-12-17
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder2013-12-05
| |/ / /
* | | | Use the word 'stuck' instead of 'sticked'Nicolas Vigier2013-10-31
|/ / /
* | | Merge branch 'mg/more-textconv'Junio C Hamano2013-10-23
|\ \ \
| * | | diff_opt: track whether flags have been set explicitlyJunio C Hamano2013-05-10
* | | | Merge branch 'jc/diff-filter-negation'Junio C Hamano2013-09-09
|\ \ \ \ | | |_|/ | |/| |
| * | | diff: deprecate -q option to diff-filesJunio C Hamano2013-07-19