aboutsummaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
Commit message (Expand)AuthorAge
* Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-27
|\
| * diff: add --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy2016-10-24
* | Merge branch 'jc/ws-error-highlight'Junio C Hamano2016-10-26
|\ \ | |/ |/|
| * diff: introduce diff.wsErrorHighlight optionJunio C Hamano2016-10-04
* | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-26
|\ \
| * | blame: honor the diff heuristic options and configMichael Haggerty2016-09-19
| * | diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-19
* | | diff: teach diff to display submodule difference with an inline diffJacob Keller2016-08-31
* | | graph: add support for --line-prefix on all graph-aware outputJacob Keller2016-08-31
* | | Merge branch 'jc/doc-diff-filter-exclude'Junio C Hamano2016-07-25
|\ \ \ | |/ / |/| |
| * | diff: document diff-filter exclusionJunio C Hamano2016-07-14
* | | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-06-10
|\ \ \
| * | | diff: disable compaction heuristic for nowJunio C Hamano2016-06-10
| * | | diff: undocument the compaction heuristic knobs for experimentationJunio C Hamano2016-05-02
| * | | xdiff: implement empty line chunk heuristicStefan Beller2016-04-19
| |/ /
* | | Documentation: fix linkgit referencesJunio C Hamano2016-05-09
* | | Merge branch 'es/format-patch-doc-hide-no-patch' into maintJunio C Hamano2016-05-02
|\ \ \
| * | | git-format-patch.txt: don't show -s as shorthand for multiple optionsEric Sunshine2016-04-04
| |/ /
| * | Merge branch 'mm/log-format-raw-doc' into maintJunio C Hamano2015-06-16
| |\ \
| * \ \ Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano2015-06-05
| |\ \ \
* | | | | Documentation: git diff --check detects conflict markersOri Avtalion2016-03-29
| |_|_|/ |/| | |
* | | | Documentation/diff: give --word-diff-regex=. exampleMichael J Gruber2015-11-24
* | | | Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano2015-06-11
|\ \ \ \
| * | | | diff.c: --ws-error-highlight=<kind> optionJunio C Hamano2015-05-26
* | | | | Merge branch 'mm/log-format-raw-doc'Junio C Hamano2015-06-01
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Documentation/log: clarify what --raw meansMatthieu Moy2015-05-18
| |/ / /
* | | | Merge branch 'jk/asciidoc-markup-fix'Junio C Hamano2015-05-22
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | doc: convert AsciiDoc {?foo} to ifdef::foo[]Jeff King2015-05-14
| |/
* | *config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy2015-03-13
|/
* Documentation: fix misuses of "nor"Justin Lebar2014-03-31
* diff: add diff.orderfile configuration variableSamuel Bronson2013-12-18
* Merge branch 'mm/diff-no-patch-synonym-to-s'Junio C Hamano2013-07-22
|\
| * Documentation: move description of -s, --no-patch to diff-options.txtMatthieu Moy2013-07-17
* | Merge branch 'ft/diff-rename-default-score-is-half'Junio C Hamano2013-07-12
|\ \
| * | diff-options: document default similarity indexFraser Tweedale2013-07-05
* | | Merge branch 'ap/diff-ignore-blank-lines'Junio C Hamano2013-06-30
|\ \ \
| * | | diff: add --ignore-blank-lines optionAntoine Pelisse2013-06-19
| | |/ | |/|
* | | Merge branch 'rr/diffcore-pickaxe-doc'Junio C Hamano2013-06-11
|\ \ \
| * | | diffcore-pickaxe doc: document -S and -G properlyRamkumar Ramachandra2013-06-03
| |/ /
| * | Merge branch 'jc/color-diff-doc'Junio C Hamano2013-03-19
| |\ \
* | | | trivial: Add missing period in documentationPhil Hord2013-05-28
* | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-25
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'jc/color-diff-doc' into maint-1.8.1Junio C Hamano2013-03-25
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * diff-options: unconfuse description of --colorJunio C Hamano2013-02-22
* | | Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-17
|\ \ \
| * | | diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-16
| |/ /
* | | Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-01
|/ /
* | Sync with 'maint'Junio C Hamano2012-12-18
|\ \
| * | clarify -M without % symbol in diff-optionsSitaram Chamarty2012-12-18
| |/
* | diff: introduce diff.submodule configuration variableRamkumar Ramachandra2012-11-18
|/