Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/diff-stat-with-summary' | Junio C Hamano | 2018-03-14 | 1 | -0/+8 |
|\ | |||||
| * | diff: add --compact-summary | Nguyễn Thái Ngọc Duy | 2018-02-28 | 1 | -0/+8 |
* | | Merge branch 'sb/diff-blobfind-pickaxe' | Junio C Hamano | 2018-01-23 | 1 | -0/+10 |
|\ \ | |/ |/| | |||||
| * | diffcore: add a pickaxe option to find a specific blob | Stefan Beller | 2018-01-05 | 1 | -0/+10 |
* | | Merge branch 'jk/doc-diff-options' | Junio C Hamano | 2018-01-09 | 1 | -0/+6 |
|\ \ | |||||
| * | | docs/diff-options: clarify scope of diff-filter types | Jeff King | 2018-01-04 | 1 | -0/+6 |
* | | | diff: support anchoring line(s) | Jonathan Tan | 2017-11-28 | 1 | -0/+10 |
* | | | Merge branch 'jc/ignore-cr-at-eol' | Junio C Hamano | 2017-11-27 | 1 | -0/+3 |
|\ \ \ | |_|/ |/| | | |||||
| * | | diff: --ignore-cr-at-eol | Junio C Hamano | 2017-11-08 | 1 | -0/+3 |
* | | | Merge branch 'cn/diff-indent-no-longer-is-experimental' | Junio C Hamano | 2017-11-06 | 1 | -1/+6 |
|\ \ \ | |||||
| * | | | diff: --indent-heuristic is no longer experimental | Carlos Martín Nieto | 2017-11-02 | 1 | -1/+6 |
| * | | | Merge branch 'ah/doc-wserrorhighlight' into maint | Junio C Hamano | 2017-08-23 | 1 | -9/+8 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'jt/diff-color-move-fix' | Junio C Hamano | 2017-08-27 | 1 | -5/+3 |
|\ \ \ \ \ | |||||
| * | | | | | diff: define block by number of alphanumeric chars | Jonathan Tan | 2017-08-16 | 1 | -5/+3 |
* | | | | | | Merge branch 'sb/diff-color-move' | Junio C Hamano | 2017-08-27 | 1 | -0/+36 |
|\| | | | | | |||||
| * | | | | | diff: document the new --color-moved setting | Stefan Beller | 2017-06-30 | 1 | -0/+36 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'ah/doc-wserrorhighlight' | Junio C Hamano | 2017-08-11 | 1 | -9/+8 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||||
| * | | | doc: add missing values "none" and "default" for diff.wsErrorHighlight | Andreas Heiduk | 2017-07-25 | 1 | -9/+8 |
| | |/ | |/| | |||||
* | | | diff-options doc: grammar fix | Anthony Sottile | 2017-07-31 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Documentation: improve description for core.quotePath | Andreas Heiduk | 2017-03-02 | 1 | -4/+3 |
|/ | |||||
* | Merge branch 'rh/diff-orderfile-doc' | Junio C Hamano | 2017-01-24 | 1 | -2/+32 |
|\ | |||||
| * | diff: document the format of the -O (diff.orderFile) file | Richard Hansen | 2017-01-16 | 1 | -2/+32 |
* | | diff: add interhunk context config option | Vegard Nossum | 2017-01-12 | 1 | -0/+2 |
|/ | |||||
* | Merge branch 'nd/ita-empty-commit' | Junio C Hamano | 2016-10-27 | 1 | -0/+8 |
|\ | |||||
| * | diff: add --ita-[in]visible-in-index | Nguyễn Thái Ngọc Duy | 2016-10-24 | 1 | -0/+8 |
* | | Merge branch 'jc/ws-error-highlight' | Junio C Hamano | 2016-10-26 | 1 | -0/+2 |
|\ \ | |/ |/| | |||||
| * | diff: introduce diff.wsErrorHighlight option | Junio C Hamano | 2016-10-05 | 1 | -0/+2 |
* | | Merge branch 'mh/diff-indent-heuristic' | Junio C Hamano | 2016-09-27 | 1 | -6/+1 |
|\ \ | |||||
| * | | blame: honor the diff heuristic options and config | Michael Haggerty | 2016-09-19 | 1 | -7/+1 |
| * | | diff: improve positioning of add/delete blocks in diffs | Michael Haggerty | 2016-09-19 | 1 | -4/+5 |
* | | | diff: teach diff to display submodule difference with an inline diff | Jacob Keller | 2016-09-01 | 1 | -7/+10 |
* | | | graph: add support for --line-prefix on all graph-aware output | Jacob Keller | 2016-09-01 | 1 | -0/+3 |
* | | | Merge branch 'jc/doc-diff-filter-exclude' | Junio C Hamano | 2016-07-25 | 1 | -0/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | diff: document diff-filter exclusion | Junio C Hamano | 2016-07-14 | 1 | -0/+3 |
* | | | Merge branch 'jk/diff-compact-heuristic' | Junio C Hamano | 2016-06-11 | 1 | -0/+7 |
|\ \ \ | |||||
| * | | | diff: disable compaction heuristic for now | Junio C Hamano | 2016-06-10 | 1 | -0/+7 |
| * | | | diff: undocument the compaction heuristic knobs for experimentation | Junio C Hamano | 2016-05-02 | 1 | -6/+0 |
| * | | | xdiff: implement empty line chunk heuristic | Stefan Beller | 2016-04-19 | 1 | -0/+6 |
| |/ / | |||||
* | | | Documentation: fix linkgit references | Junio C Hamano | 2016-05-10 | 1 | -1/+1 |
* | | | Merge branch 'es/format-patch-doc-hide-no-patch' into maint | Junio C Hamano | 2016-05-02 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | git-format-patch.txt: don't show -s as shorthand for multiple options | Eric Sunshine | 2016-04-04 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge branch 'mm/log-format-raw-doc' into maint | Junio C Hamano | 2015-06-16 | 1 | -1/+10 |
| |\ \ | |||||
| * \ \ | Merge branch 'jk/asciidoc-markup-fix' into maint | Junio C Hamano | 2015-06-05 | 1 | -2/+6 |
| |\ \ \ | |||||
* | | | | | Documentation: git diff --check detects conflict markers | Ori Avtalion | 2016-03-29 | 1 | -2/+2 |
| |_|_|/ |/| | | | |||||
* | | | | Documentation/diff: give --word-diff-regex=. example | Michael J Gruber | 2015-11-25 | 1 | -0/+3 |
* | | | | Merge branch 'jc/diff-ws-error-highlight' | Junio C Hamano | 2015-06-11 | 1 | -0/+10 |
|\ \ \ \ | |||||
| * | | | | diff.c: --ws-error-highlight=<kind> option | Junio C Hamano | 2015-05-27 | 1 | -0/+10 |
* | | | | | Merge branch 'mm/log-format-raw-doc' | Junio C Hamano | 2015-06-01 | 1 | -1/+10 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Documentation/log: clarify what --raw means | Matthieu Moy | 2015-05-18 | 1 | -1/+10 |
| |/ / / | |||||
* | | | | Merge branch 'jk/asciidoc-markup-fix' | Junio C Hamano | 2015-05-22 | 1 | -2/+6 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| |