summaryrefslogtreecommitdiffstats
path: root/Documentation/diff-options.txt
AgeCommit message (Expand)AuthorLines
2013-03-25Merge branch 'maint-1.8.1' into maintJunio C Hamano-2/+2
2013-03-25Merge branch 'jc/color-diff-doc' into maint-1.8.1Junio C Hamano-2/+2
2013-02-22diff-options: unconfuse description of --colorJunio C Hamano-2/+2
2013-02-17Merge branch 'mp/diff-algo-config'Junio C Hamano-0/+20
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann-2/+2
2013-01-16diff: Introduce --diff-algorithm command line optionMichal Privoznik-0/+20
2012-12-18Sync with 'maint'Junio C Hamano-1/+5
2012-12-18clarify -M without % symbol in diff-optionsSitaram Chamarty-1/+5
2012-11-18diff: introduce diff.submodule configuration variableRamkumar Ramachandra-1/+2
2012-06-22Documentation: Fix misspellingsLeila Muhtasib-1/+1
2012-04-26docs: stop using asciidoc no-inline-literalJeff King-1/+1
2012-03-15Merge branch 'th/doc-diff-submodule-option'Junio C Hamano-5/+6
2012-03-14Documentation/diff-options: reword description of --submodule optionTim Henigan-5/+6
2012-03-06Merge branch 'zj/diff-stat-dyncol'Junio C Hamano-6/+12
2012-03-06Merge branch 'maint-1.7.7' into maint-1.7.8Junio C Hamano-0/+3
2012-03-06Document the --histogram diff optionThomas Rast-0/+3
2012-03-01diff --stat: add config option to limit graph widthZbigniew Jędrzejewski-Szmek-7/+9
2012-03-01diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek-0/+2
2012-03-01diff --stat: use a maximum of 5/8 for the filename partZbigniew Jędrzejewski-Szmek-6/+8
2011-11-08Sync with 1.7.7.3Junio C Hamano-0/+2
2011-11-08docs: don't mention --quiet or --exit-code in git-log(1)Jeff King-0/+2
2011-10-19Merge branch 'rs/diff-whole-function'Junio C Hamano-0/+4
2011-10-10diff: add option to show whole functions as contextRené Scharfe-0/+4
2011-10-03diff: resurrect XDF_NEED_MINIMAL with --minimalJunio C Hamano-0/+4
2011-07-06Merge branch 'maint'Junio C Hamano-0/+11
2011-07-06docs: document --textconv diff optionJeff King-0/+11
2011-06-29Merge branch 'mg/diff-stat-count'Junio C Hamano-1/+7
2011-06-22Merge branch 'maint'Junio C Hamano-4/+8
2011-06-22Documentation: git diff --check respects core.whitespaceChristof Krüger-4/+8
2011-05-27diff-options.txt: describe --stat-{width,name-width,count}Michael J Gruber-0/+3
2011-05-27diff: introduce --stat-lines to limit the stat linesMichael J Gruber-1/+4
2011-05-26Merge branch 'mg/diff-uiconfig-doc' into maintJunio C Hamano-4/+11
2011-05-13Merge branch 'jh/dirstat-lines'Junio C Hamano-12/+42
2011-05-06Merge branch 'mg/diff-uiconfig-doc'Junio C Hamano-4/+11
2011-05-06Merge branch 'maint'Junio C Hamano-1/+1
2011-05-05Remove duplicated "is a"João Britto-1/+1
2011-04-29New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland-0/+8
2011-04-29Add config variable for specifying default --dirstat behaviorJohan Herland-0/+2
2011-04-29Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-fileJohan Herland-12/+32
2011-04-28Merge branch 'jc/diff-irreversible-delete'Junio C Hamano-0/+13
2011-04-27config.txt,diff-options.txt: porcelain vs. plumbing for color.diffMichael J Gruber-4/+11
2011-04-11Teach --dirstat not to completely ignore rearranged lines within a fileJohan Herland-2/+2
2011-04-11--dirstat: Describe non-obvious differences relative to --stat or regular diffJohan Herland-0/+4
2011-04-02git diff -D: omit the preimage of deletesJunio C Hamano-0/+13
2010-12-10diff: use "find" instead of "detect" as prefix for long forms of -M and -CYann Dirson-3/+2
2010-11-29diff: add --detect-copies-harder as a synonym for --find-copies-harderKevin Ballard-0/+1
2010-11-17Merge branch 'maint'Junio C Hamano-14/+12
2010-11-16Keep together options controlling the behaviour of diffcore-rename.Yann Dirson-14/+12
2010-10-26Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano-0/+3
2010-10-21Sync with 1.7.3.2Junio C Hamano-7/+7