summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-171-0/+20
|\
| * diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-161-0/+20
* | Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-011-2/+2
|/
* Sync with 'maint'Junio C Hamano2012-12-181-1/+5
|\
| * clarify -M without % symbol in diff-optionsSitaram Chamarty2012-12-181-1/+5
* | diff: introduce diff.submodule configuration variableRamkumar Ramachandra2012-11-181-1/+2
|/
* Documentation: Fix misspellingsLeila Muhtasib2012-06-221-1/+1
* docs: stop using asciidoc no-inline-literalJeff King2012-04-261-1/+1
* Merge branch 'th/doc-diff-submodule-option'Junio C Hamano2012-03-151-5/+6
|\
| * Documentation/diff-options: reword description of --submodule optionth/doc-diff-submodule-optionTim Henigan2012-03-141-5/+6
* | Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-061-6/+12
|\ \
| * | diff --stat: add config option to limit graph widthzj/diff-stat-dyncolZbigniew Jędrzejewski-Szmek2012-03-011-7/+9
| * | diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek2012-03-011-0/+2
| * | diff --stat: use a maximum of 5/8 for the filename partZbigniew Jędrzejewski-Szmek2012-03-011-6/+8
* | | Merge branch 'maint-1.7.7' into maint-1.7.8Junio C Hamano2012-03-061-0/+3
|\ \ \ | |/ / |/| |
| * | Document the --histogram diff optionThomas Rast2012-03-061-0/+3
* | | Sync with 1.7.7.3Junio C Hamano2011-11-081-0/+2
|\ \ \ | |/ /
| * | docs: don't mention --quiet or --exit-code in git-log(1)Jeff King2011-11-081-0/+2
* | | Merge branch 'rs/diff-whole-function'Junio C Hamano2011-10-191-0/+4
|\ \ \ | |/ / |/| |
| * | diff: add option to show whole functions as contextrs/diff-whole-functionRené Scharfe2011-10-101-0/+4
* | | diff: resurrect XDF_NEED_MINIMAL with --minimalJunio C Hamano2011-10-031-0/+4
|/ /
* | Merge branch 'maint'Junio C Hamano2011-07-061-0/+11
|\ \
| * | docs: document --textconv diff optionJeff King2011-07-061-0/+11
* | | 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
View Lorry Controller Status