| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jk/external-diff-use-argv-array' (early part) | Junio C Hamano | 2014-04-28 | 1 | -16/+16 |
|\ |
|
| * | run_external_diff: use an argv_array for the command line | Jeff King | 2014-04-21 | 1 | -16/+16 |
* | | i18n: remove obsolete comments for translators in diffstat generation | Jiang Xin | 2014-04-17 | 1 | -8/+0 |
* | | Merge branch 'jl/nor-or-nand-and' | Junio C Hamano | 2014-04-08 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | comments: fix misuses of "nor" | Justin Lebar | 2014-03-31 | 1 | -1/+1 |
| * | Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint | Junio C Hamano | 2014-03-18 | 1 | -2/+3 |
| |\ |
|
| * \ | Merge branch 'nd/diff-quiet-stat-dirty' into maint | Junio C Hamano | 2014-03-18 | 1 | -24/+43 |
| |\ \ |
|
* | \ \ | Merge branch 'rm/strchrnul-not-strlen' | Junio C Hamano | 2014-03-18 | 1 | -6/+3 |
|\ \ \ \ |
|
| * | | | | use strchrnul() in place of strchr() and strlen()rm/strchrnul-not-strlen | Rohit Mani | 2014-03-10 | 1 | -6/+3 |
| |/ / / |
|
* | | | | Merge branch 'dd/use-alloc-grow' | Junio C Hamano | 2014-03-18 | 1 | -10/+2 |
|\ \ \ \ |
|
| * | | | | diff.c: use ALLOC_GROW() | Dmitry S. Dolzhenko | 2014-03-03 | 1 | -10/+2 |
| |/ / / |
|
* | | | | Merge branch 'tr/diff-submodule-no-reuse-worktree' | Junio C Hamano | 2014-03-14 | 1 | -2/+3 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | diff: do not reuse_worktree_file for submodulestr/diff-submodule-no-reuse-worktree | Thomas Rast | 2014-02-18 | 1 | -2/+3 |
* | | | | Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion' | Junio C Hamano | 2014-03-07 | 1 | -8/+0 |
|\ \ \ \ |
|
| * | | | | diff: remove "diff-files -q" in a version of Git in a distant futurejc/hold-diff-remove-q-synonym-for-no-deletion | Junio C Hamano | 2013-07-19 | 1 | -8/+0 |
* | | | | | Merge branch 'nd/diff-quiet-stat-dirty' | Junio C Hamano | 2014-02-27 | 1 | -24/+43 |
|\ \ \ \ \
| |_|_|/ /
|/| | | /
| | |_|/
| |/| | |
|
| * | | | diff: do not quit early on stat-dirty filesnd/diff-quiet-stat-dirty | Nguyễn Thái Ngọc Duy | 2014-02-24 | 1 | -5/+17 |
| * | | | diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later | Nguyễn Thái Ngọc Duy | 2014-02-24 | 1 | -21/+28 |
| | |/
| |/| |
|
* | | | Merge branch 'jk/diff-filespec-cleanup' | Junio C Hamano | 2014-01-27 | 1 | -2/+2 |
|\ \ \ |
|
| * | | | diff_filespec: drop xfrm_flags field | Jeff King | 2014-01-17 | 1 | -2/+2 |
* | | | | Merge branch 'sb/diff-orderfile-config' | Junio C Hamano | 2014-01-10 | 1 | -0/+5 |
|\ \ \ \ |
|
| * | | | | diff: add diff.orderfile configuration variable | Samuel Bronson | 2013-12-18 | 1 | -0/+5 |
* | | | | | Merge branch 'zk/difftool-counts' | Junio C Hamano | 2013-12-27 | 1 | -3/+17 |
|\ \ \ \ \ |
|
| * | | | | | diff.c: fix some recent whitespace style violationszk/difftool-counts | Jeff King | 2013-12-16 | 1 | -2/+2 |
| * | | | | | difftool: display the number of files in the diff queue in the prompt | Zoltan Klinger | 2013-12-06 | 1 | -3/+17 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge branch 'cc/starts-n-ends-with' | Junio C Hamano | 2013-12-17 | 1 | -28/+28 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-with | Christian Couder | 2013-12-05 | 1 | -28/+28 |
| |/ / / |
|
* | | | | Use the word 'stuck' instead of 'sticked' | Nicolas Vigier | 2013-10-31 | 1 | -1/+1 |
|/ / / |
|
* | | | Merge branch 'mg/more-textconv' | Junio C Hamano | 2013-10-23 | 1 | -0/+3 |
|\ \ \ |
|
| * | | | diff_opt: track whether flags have been set explicitly | Junio C Hamano | 2013-05-10 | 1 | -0/+3 |
* | | | | Merge branch 'jc/diff-filter-negation' | Junio C Hamano | 2013-09-09 | 1 | -21/+104 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | diff: deprecate -q option to diff-filesjc/diff-filter-negation | Junio C Hamano | 2013-07-19 | 1 | -0/+8 |
| * | | | diff: allow lowercase letter to specify what change class to exclude | Junio C Hamano | 2013-07-17 | 1 | -1/+28 |
| * | | | diff: reject unknown change class given to --diff-filter | Junio C Hamano | 2013-07-17 | 1 | -1/+1 |
| * | | | diff: preparse --diff-filter string argument | Junio C Hamano | 2013-07-17 | 1 | -7/+56 |
| * | | | diff: factor out match_filter() | Junio C Hamano | 2013-07-17 | 1 | -16/+13 |
| * | | | diff: pass the whole diff_options to diffcore_apply_filter() | Junio C Hamano | 2013-07-17 | 1 | -2/+4 |
* | | | | diff: fix a possible null pointer dereference | Stefan Beller | 2013-08-09 | 1 | -1/+1 |
* | | | | diff: remove ternary operator evaluating always to true | Stefan Beller | 2013-08-09 | 1 | -2/+2 |
| |_|/
|/| | |
|
* | | | Merge branch 'ob/typofixes' | Junio C Hamano | 2013-07-24 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | typofix: in-code comments | Ondřej Bílka | 2013-07-22 | 1 | -1/+1 |
* | | | | Merge branch 'sb/misc-fixes' | Junio C Hamano | 2013-07-24 | 1 | -3/+1 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | diff.c: Do not initialize a variable, which gets reassigned anyway.sb/misc-fixes | Stefan Beller | 2013-07-15 | 1 | -3/+1 |
| |/ / |
|
| * | | Merge branch 'jk/diff-algo-finishing-touches' into maint | Junio C Hamano | 2013-04-24 | 1 | -2/+3 |
| |\ \ |
|
* | \ \ | Merge branch 'nd/const-struct-cache-entry' | Junio C Hamano | 2013-07-22 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entry | Nguyễn Thái Ngọc Duy | 2013-07-09 | 1 | -1/+1 |
* | | | | | Merge branch 'mm/diff-no-patch-synonym-to-s' | Junio C Hamano | 2013-07-22 | 1 | -12/+18 |
|\ \ \ \ \ |
|
| * | | | | | diff: allow --patch & cie to override -s/--no-patch | Matthieu Moy | 2013-07-17 | 1 | -11/+17 |
| * | | | | | diff: allow --no-patch as synonym for -s | Matthieu Moy | 2013-07-17 | 1 | -1/+1 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge branch 'jc/maint-diff-core-safecrlf' | Junio C Hamano | 2013-07-11 | 1 | -1/+9 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|