Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mm/diff-no-patch-synonym-to-s' | Junio C Hamano | 2013-07-22 | 1 | -0/+5 |
|\ | |||||
| * | Documentation: move description of -s, --no-patch to diff-options.txt | Matthieu Moy | 2013-07-17 | 1 | -0/+5 |
* | | Merge branch 'ft/diff-rename-default-score-is-half' | Junio C Hamano | 2013-07-12 | 1 | -1/+1 |
|\ \ | |||||
| * | | diff-options: document default similarity index | Fraser Tweedale | 2013-07-05 | 1 | -1/+1 |
* | | | Merge branch 'ap/diff-ignore-blank-lines' | Junio C Hamano | 2013-06-30 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | diff: add --ignore-blank-lines option | Antoine Pelisse | 2013-06-19 | 1 | -0/+3 |
| | |/ | |/| | |||||
* | | | Merge branch 'rr/diffcore-pickaxe-doc' | Junio C Hamano | 2013-06-11 | 1 | -8/+30 |
|\ \ \ | |||||
| * | | | diffcore-pickaxe doc: document -S and -G properly | Ramkumar Ramachandra | 2013-06-03 | 1 | -8/+30 |
| |/ / | |||||
| * | | Merge branch 'jc/color-diff-doc' | Junio C Hamano | 2013-03-19 | 1 | -2/+2 |
| |\ \ | |||||
* | | | | trivial: Add missing period in documentation | Phil Hord | 2013-05-28 | 1 | -1/+1 |
* | | | | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-25 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 'jc/color-diff-doc' into maint-1.8.1 | Junio C Hamano | 2013-03-25 | 1 | -2/+2 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | diff-options: unconfuse description of --color | Junio C Hamano | 2013-02-22 | 1 | -2/+2 |
* | | | Merge branch 'mp/diff-algo-config' | Junio C Hamano | 2013-02-17 | 1 | -0/+20 |
|\ \ \ | |||||
| * | | | diff: Introduce --diff-algorithm command line option | Michal Privoznik | 2013-01-16 | 1 | -0/+20 |
| |/ / | |||||
* | | | Documentation: the name of the system is 'Git', not 'git' | Thomas Ackermann | 2013-02-01 | 1 | -2/+2 |
|/ / | |||||
* | | Sync with 'maint' | Junio C Hamano | 2012-12-18 | 1 | -1/+5 |
|\ \ | |||||
| * | | clarify -M without % symbol in diff-options | Sitaram Chamarty | 2012-12-18 | 1 | -1/+5 |
| |/ | |||||
* | | diff: introduce diff.submodule configuration variable | Ramkumar Ramachandra | 2012-11-18 | 1 | -1/+2 |
|/ | |||||
* | Documentation: Fix misspellings | Leila Muhtasib | 2012-06-22 | 1 | -1/+1 |
* | docs: stop using asciidoc no-inline-literal | Jeff King | 2012-04-26 | 1 | -1/+1 |
* | Merge branch 'th/doc-diff-submodule-option' | Junio C Hamano | 2012-03-15 | 1 | -5/+6 |
|\ | |||||
| * | Documentation/diff-options: reword description of --submodule optionth/doc-diff-submodule-option | Tim Henigan | 2012-03-14 | 1 | -5/+6 |
* | | Merge branch 'zj/diff-stat-dyncol' | Junio C Hamano | 2012-03-06 | 1 | -6/+12 |
|\ \ | |||||
| * | | diff --stat: add config option to limit graph widthzj/diff-stat-dyncol | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -7/+9 |
| * | | diff --stat: enable limiting of the graph part | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -0/+2 |
| * | | diff --stat: use a maximum of 5/8 for the filename part | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -6/+8 |
* | | | Merge branch 'maint-1.7.7' into maint-1.7.8 | Junio C Hamano | 2012-03-06 | 1 | -0/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Document the --histogram diff option | Thomas Rast | 2012-03-06 | 1 | -0/+3 |
* | | | Sync with 1.7.7.3 | Junio C Hamano | 2011-11-08 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | docs: don't mention --quiet or --exit-code in git-log(1) | Jeff King | 2011-11-08 | 1 | -0/+2 |
* | | | Merge branch 'rs/diff-whole-function' | Junio C Hamano | 2011-10-19 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | |||||
| * | | diff: add option to show whole functions as contextrs/diff-whole-function | René Scharfe | 2011-10-10 | 1 | -0/+4 |
* | | | diff: resurrect XDF_NEED_MINIMAL with --minimal | Junio C Hamano | 2011-10-03 | 1 | -0/+4 |
|/ / | |||||
* | | Merge branch 'maint' | Junio C Hamano | 2011-07-06 | 1 | -0/+11 |
|\ \ | |||||
| * | | docs: document --textconv diff option | Jeff King | 2011-07-06 | 1 | -0/+11 |
* | | | Merge branch 'mg/diff-stat-count' | Junio C Hamano | 2011-06-29 | 1 | -1/+7 |
|\ \ \ | |/ / |/| | | |||||
| * | | diff-options.txt: describe --stat-{width,name-width,count} | Michael J Gruber | 2011-05-27 | 1 | -0/+3 |
| * | | diff: introduce --stat-lines to limit the stat lines | Michael J Gruber | 2011-05-27 | 1 | -1/+4 |
* | | | Merge branch 'maint' | Junio C Hamano | 2011-06-22 | 1 | -4/+8 |
|\ \ \ | |||||
| * | | | Documentation: git diff --check respects core.whitespace | Christof Krüger | 2011-06-22 | 1 | -4/+8 |
| * | | | Merge branch 'mg/diff-uiconfig-doc' into maint | Junio C Hamano | 2011-05-26 | 1 | -4/+11 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'jh/dirstat-lines' | Junio C Hamano | 2011-05-13 | 1 | -12/+42 |
|\ \ \ \ \ | |||||
| * | | | | | New --dirstat=lines mode, doing dirstat analysis based on diffstat | Johan Herland | 2011-04-29 | 1 | -0/+8 |
| * | | | | | Add config variable for specifying default --dirstat behavior | Johan Herland | 2011-04-29 | 1 | -0/+2 |
| * | | | | | Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file | Johan Herland | 2011-04-29 | 1 | -12/+32 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'mg/diff-uiconfig-doc' | Junio C Hamano | 2011-05-06 | 1 | -4/+11 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | config.txt,diff-options.txt: porcelain vs. plumbing for color.diff | Michael J Gruber | 2011-04-27 | 1 | -4/+11 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-06 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Remove duplicated "is a" | João Britto | 2011-05-05 | 1 | -1/+1 |