Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | 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 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | diff: demote core.safecrlf=true to core.safecrlf=warn | Junio C Hamano | 2013-06-25 | 1 | -1/+9 | |
* | | | | | diff: add --ignore-blank-lines option | Antoine Pelisse | 2013-06-19 | 1 | -0/+2 | |
| |/ / / |/| | | | ||||||
* | | | | Merge branch 'jk/diff-graph-submodule-summary' | Junio C Hamano | 2013-04-15 | 1 | -0/+1 | |
|\ \ \ \ | ||||||
| * | | | | submodule: print graph output next to submodule log | John Keeping | 2013-04-05 | 1 | -0/+1 | |
| * | | | | Merge branch 'ap/maint-diff-rename-avoid-overlap' | Junio C Hamano | 2013-03-25 | 1 | -1/+13 | |
| |\ \ \ \ | ||||||
* | \ \ \ \ | Merge branch 'jk/diff-algo-finishing-touches' | Junio C Hamano | 2013-04-15 | 1 | -2/+3 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | ||||||
| * | | | | diff: allow unstuck arguments with --diff-algorithm | John Keeping | 2013-04-05 | 1 | -2/+3 | |
* | | | | | Correct common spelling mistakes in comments and tests | Stefano Lattarini | 2013-04-12 | 1 | -1/+1 | |
* | | | | | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint | Junio C Hamano | 2013-04-01 | 1 | -1/+13 | |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | ||||||
| * | | | diff: prevent pprint_rename from underrunning input | Thomas Rast | 2013-02-26 | 1 | -7/+10 | |
| * | | | diff: Fix rename pretty-print when suffix and prefix overlap | Antoine Pelisse | 2013-02-23 | 1 | -1/+10 | |
* | | | | diff.c: diff.renamelimit => diff.renameLimit in message | Max Nanasy | 2013-03-21 | 1 | -1/+1 | |
* | | | | Merge branch 'mp/diff-algo-config' | Junio C Hamano | 2013-02-17 | 1 | -0/+34 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | diff: Introduce --diff-algorithm command line option | Michal Privoznik | 2013-01-16 | 1 | -1/+11 | |
| * | | | config: Introduce diff.algorithm variable | Michal Privoznik | 2013-01-16 | 1 | -0/+24 | |
* | | | | Merge branch 'jk/diff-graph-cleanup' | Junio C Hamano | 2013-02-14 | 1 | -97/+34 | |
|\ \ \ \ | ||||||
| * | | | | diff.c: use diff_line_prefix() where applicable | John Keeping | 2013-02-12 | 1 | -95/+20 | |
| * | | | | diff: add diff_line_prefix function | John Keeping | 2013-02-12 | 1 | -0/+10 | |
| * | | | | diff.c: make constant string arguments const | John Keeping | 2013-02-12 | 1 | -2/+4 |