summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mg/diff-stat-count'Junio C Hamano2011-06-291-1/+7
|\
| * diff-options.txt: describe --stat-{width,name-width,count}Michael J Gruber2011-05-271-0/+3
| * diff: introduce --stat-lines to limit the stat linesMichael J Gruber2011-05-271-1/+4
* | Merge branch 'maint'Junio C Hamano2011-06-221-4/+8
|\ \
| * | Documentation: git diff --check respects core.whitespaceChristof Krüger2011-06-221-4/+8
| * | Merge branch 'mg/diff-uiconfig-doc' into maintJunio C Hamano2011-05-261-4/+11
| |\ \
* | \ \ Merge branch 'jh/dirstat-lines'Junio C Hamano2011-05-131-12/+42
|\ \ \ \
| * | | | New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland2011-04-291-0/+8
| * | | | Add config variable for specifying default --dirstat behaviorJohan Herland2011-04-291-0/+2
| * | | | Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-fileJohan Herland2011-04-291-12/+32
| | |_|/ | |/| |
* | | | Merge branch 'mg/diff-uiconfig-doc'Junio C Hamano2011-05-061-4/+11
|\ \ \ \ | | |_|/ | |/| |
| * | | config.txt,diff-options.txt: porcelain vs. plumbing for color.diffMichael J Gruber2011-04-271-4/+11
* | | | Merge branch 'maint'Junio C Hamano2011-05-061-1/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Remove duplicated "is a"João Britto2011-05-051-1/+1
* | | Merge branch 'jc/diff-irreversible-delete'Junio C Hamano2011-04-281-0/+13
|\ \ \ | |/ / |/| |
| * | git diff -D: omit the preimage of deletesJunio C Hamano2011-04-021-0/+13
| |/
* | Teach --dirstat not to completely ignore rearranged lines within a fileJohan Herland2011-04-111-2/+2
* | --dirstat: Describe non-obvious differences relative to --stat or regular diffJohan Herland2011-04-111-0/+4
|/
* diff: use "find" instead of "detect" as prefix for long forms of -M and -CYann Dirson2010-12-101-3/+2
* diff: add --detect-copies-harder as a synonym for --find-copies-harderKevin Ballard2010-11-291-0/+1
* Merge branch 'maint'Junio C Hamano2010-11-171-14/+12
|\
| * Keep together options controlling the behaviour of diffcore-rename.Yann Dirson2010-11-161-14/+12
* | Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano2010-10-261-0/+3
|\ \
| * | diff: add synonyms for -M, -C, -BKevin Ballard2010-09-291-0/+3
* | | Sync with 1.7.3.2Junio C Hamano2010-10-211-7/+7
|\ \ \ | | |/ | |/|
| * | Fix odd markup in --diff-filter documentationŠtěpán Němec2010-10-081-2/+2
| * | Use angles for placeholders consistentlyŠtěpán Němec2010-10-081-5/+5
* | | git log/diff: add -G<regexp> that greps in the patch textJunio C Hamano2010-08-311-1/+5
|/ /
* | Merge branch 'jl/submodule-ignore-diff'Junio C Hamano2010-08-181-1/+5
|\ \
| * | Submodules: Use "ignore" settings from .gitmodules too for diff and statusJens Lehmann2010-08-091-1/+1
| * | Submodules: Add the new "ignore" config option for diff and statusJens Lehmann2010-08-091-1/+5
* | | Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -CMatthieu Moy2010-08-091-5/+30
|/ /
* | Merge branch 'jl/maint-diff-ignore-submodules'Junio C Hamano2010-06-301-2/+8
|\ \ | |/ |/|
| * Add optional parameters to the diff option "--ignore-submodules"Jens Lehmann2010-06-111-2/+8
* | Merge branch 'jk/diff-m-doc'Junio C Hamano2010-06-131-0/+7
|\ \
| * | docs: clarify meaning of -M for git-logJeff King2010-05-181-0/+7
| |/
* | Merge branch 'tr/word-diff'Junio C Hamano2010-05-211-4/+36
|\ \
| * | diff: add --word-diff option that generalizes --color-wordsThomas Rast2010-04-141-4/+36
* | | diff-options: make --patch a synonym for -pWill Palmer2010-05-181-0/+1
| |/ |/|
* | Merge branch 'maint'Junio C Hamano2010-04-181-2/+2
|\ \ | |/ |/|
| * Documentation: Describe other situations where -z affects git diffCharles Bailey2010-04-181-2/+2
* | Add an optional argument for --color optionsMark Lodato2010-02-181-1/+3
|/
* Fix over-simplified documentation for 'git log -z'Björn Gustavsson2009-11-231-5/+7
* Clarify and correct -zBjörn Gustavsson2009-11-221-3/+14
* Merge branch 'bg/format-patch-doc-update'Junio C Hamano2009-11-201-20/+41
|\
| * format-patch: Add "--no-stat" as a synonym for "-p"Björn Gustavsson2009-11-101-0/+1
| * format-patch documentation: Fix formattingBjörn Gustavsson2009-11-101-18/+18
| * format-patch documentation: Remove diff options that are not usefulBjörn Gustavsson2009-11-101-2/+12
| * format-patch: Always generate a patchBjörn Gustavsson2009-11-101-3/+13
* | Add the --submodule option to the diff option familyJohannes Schindelin2009-10-191-0/+7
|/
View Lorry Controller Status