| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
* | | | Merge branch 'jc/diff-irreversible-delete' | Junio C Hamano | 2011-04-28 | 1 | -0/+13 |
|\ \ \
| |/ /
|/| | |
|
| * | | git diff -D: omit the preimage of deletes | Junio C Hamano | 2011-04-02 | 1 | -0/+13 |
| |/ |
|
* | | Teach --dirstat not to completely ignore rearranged lines within a file | Johan Herland | 2011-04-11 | 1 | -2/+2 |
* | | --dirstat: Describe non-obvious differences relative to --stat or regular diff | Johan Herland | 2011-04-11 | 1 | -0/+4 |
|/ |
|
* | diff: use "find" instead of "detect" as prefix for long forms of -M and -C | Yann Dirson | 2010-12-10 | 1 | -3/+2 |
* | diff: add --detect-copies-harder as a synonym for --find-copies-harder | Kevin Ballard | 2010-11-29 | 1 | -0/+1 |
* | Merge branch 'maint' | Junio C Hamano | 2010-11-17 | 1 | -14/+12 |
|\ |
|
| * | Keep together options controlling the behaviour of diffcore-rename. | Yann Dirson | 2010-11-16 | 1 | -14/+12 |
* | | Merge branch 'kb/merge-recursive-rename-threshold' | Junio C Hamano | 2010-10-26 | 1 | -0/+3 |
|\ \ |
|
| * | | diff: add synonyms for -M, -C, -B | Kevin Ballard | 2010-09-29 | 1 | -0/+3 |
* | | | Sync with 1.7.3.2 | Junio C Hamano | 2010-10-21 | 1 | -7/+7 |
|\ \ \
| | |/
| |/| |
|
| * | | Fix odd markup in --diff-filter documentation | Štěpán Němec | 2010-10-08 | 1 | -2/+2 |
| * | | Use angles for placeholders consistently | Štěpán Němec | 2010-10-08 | 1 | -5/+5 |
* | | | git log/diff: add -G<regexp> that greps in the patch text | Junio C Hamano | 2010-08-31 | 1 | -1/+5 |
|/ / |
|
* | | Merge branch 'jl/submodule-ignore-diff' | Junio C Hamano | 2010-08-18 | 1 | -1/+5 |
|\ \ |
|
| * | | Submodules: Use "ignore" settings from .gitmodules too for diff and status | Jens Lehmann | 2010-08-09 | 1 | -1/+1 |
| * | | Submodules: Add the new "ignore" config option for diff and status | Jens Lehmann | 2010-08-09 | 1 | -1/+5 |
* | | | Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C | Matthieu Moy | 2010-08-09 | 1 | -5/+30 |
|/ / |
|
* | | Merge branch 'jl/maint-diff-ignore-submodules' | Junio C Hamano | 2010-06-30 | 1 | -2/+8 |
|\ \
| |/
|/| |
|
| * | Add optional parameters to the diff option "--ignore-submodules" | Jens Lehmann | 2010-06-11 | 1 | -2/+8 |
* | | Merge branch 'jk/diff-m-doc' | Junio C Hamano | 2010-06-13 | 1 | -0/+7 |
|\ \ |
|
| * | | docs: clarify meaning of -M for git-log | Jeff King | 2010-05-18 | 1 | -0/+7 |
| |/ |
|
* | | Merge branch 'tr/word-diff' | Junio C Hamano | 2010-05-21 | 1 | -4/+36 |
|\ \ |
|
| * | | diff: add --word-diff option that generalizes --color-words | Thomas Rast | 2010-04-14 | 1 | -4/+36 |
* | | | diff-options: make --patch a synonym for -p | Will Palmer | 2010-05-18 | 1 | -0/+1 |
| |/
|/| |
|
* | | Merge branch 'maint' | Junio C Hamano | 2010-04-18 | 1 | -2/+2 |
|\ \
| |/
|/| |
|
| * | Documentation: Describe other situations where -z affects git diff | Charles Bailey | 2010-04-18 | 1 | -2/+2 |
* | | Add an optional argument for --color options | Mark Lodato | 2010-02-18 | 1 | -1/+3 |
|/ |
|
* | Fix over-simplified documentation for 'git log -z' | Björn Gustavsson | 2009-11-23 | 1 | -5/+7 |
* | Clarify and correct -z | Björn Gustavsson | 2009-11-22 | 1 | -3/+14 |
* | Merge branch 'bg/format-patch-doc-update' | Junio C Hamano | 2009-11-20 | 1 | -20/+41 |
|\ |
|
| * | format-patch: Add "--no-stat" as a synonym for "-p" | Björn Gustavsson | 2009-11-10 | 1 | -0/+1 |
| * | format-patch documentation: Fix formatting | Björn Gustavsson | 2009-11-10 | 1 | -18/+18 |
| * | format-patch documentation: Remove diff options that are not useful | Björn Gustavsson | 2009-11-10 | 1 | -2/+12 |