aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAge
* Merge branch 'jc/decorate-leaky-separator-color' into HEADJunio C Hamano2015-03-10
|\
| * log --decorate: do not leak "commit" color into the next itemJunio C Hamano2015-03-04
| * Documentation/config.txt: simplify boolean description in the syntax sectionJunio C Hamano2015-03-04
| * Documentation/config.txt: describe 'color' value type in the "Values" sectionJunio C Hamano2015-03-04
| * Documentation/config.txt: have a separate "Values" sectionJunio C Hamano2015-03-04
| * Documentation/config.txt: describe the structure first and then meaningJunio C Hamano2015-03-04
| * Documentation/config.txt: explain multi-valued variables onceJunio C Hamano2015-03-04
| * Documentation/config.txt: avoid unnecessary negationJunio C Hamano2015-03-04
* | Merge branch 'mm/am-c-doc' into maintJunio C Hamano2015-03-06
|\ \
| * | Documentation/config.txt: document mailinfo.scissorsMatthieu Moy2015-02-20
* | | Merge branch 'jc/conf-var-doc' into maintJunio C Hamano2015-03-05
|\ \ \
| * | | config.txt: mark deprecated variables more prominentlyJunio C Hamano2015-01-28
| * | | config.txt: clarify that add.ignore-errors is deprecatedJunio C Hamano2015-01-28
* | | | Merge branch 'po/doc-core-ignorestat'Junio C Hamano2015-01-14
|\ \ \ \
| * | | | doc: core.ignoreStat update, and clarify the --assume-unchanged effectPhilip Oakley2015-01-12
| * | | | doc: core.ignoreStat clarify the --assume-unchanged effectPhilip Oakley2014-12-12
* | | | | Merge branch 'lh/send-email-hide-x-mailer'Junio C Hamano2015-01-07
|\ \ \ \ \
| * | | | | send-email: add --[no-]xmailer optionLuis Henriques2014-12-15
* | | | | | Merge branch 'jk/colors'Junio C Hamano2014-12-22
|\ \ \ \ \ \
| * | | | | | parse_color: recognize "no$foo" to clear the $foo attributeJeff King2014-11-20
| * | | | | | parse_color: support 24-bit RGB valuesJeff King2014-11-20
* | | | | | | Merge branch 'js/push-to-deploy'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \
| * | | | | | | receive-pack: add another option for receive.denyCurrentBranchJohannes Schindelin2014-11-30
* | | | | | | | Merge branch 'pb/send-email-te'Junio C Hamano2014-12-22
|\ \ \ \ \ \ \ \
| * | | | | | | | git-send-email: add --transfer-encoding optionPaolo Bonzini2014-11-25
* | | | | | | | | Sync with v2.2.1Junio C Hamano2014-12-18
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Sync with v2.1.4Junio C Hamano2014-12-17
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Sync with v2.0.5Junio C Hamano2014-12-17
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | / / | | | | |_|/ / | | | |/| | |
| | | * | | | Sync with v1.9.5Junio C Hamano2014-12-17
| | | |\ \ \ \
| | | | * \ \ \ Sync with v1.8.5.6Junio C Hamano2014-12-17
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | * | | read-cache: optionally disallow NTFS .git variantsJohannes Schindelin2014-12-17
| | | | | * | | read-cache: optionally disallow HFS+ .git variantsJeff King2014-12-17
* | | | | | | | Merge branch 'jk/colors-fix'Junio C Hamano2014-12-12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | docs: describe ANSI 256-color modeJeff King2014-11-20
| |/ / / / /
* | | | | | Sync with maintJunio C Hamano2014-11-10
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Documentation/config.txt: fix minor typoThomas Quinot2014-11-10
| * | | | config.txt: fix typoNicolas Dermine2014-11-10
* | | | | Documentation: typofixesThomas Ackermann2014-11-04
* | | | | Merge branch 'rs/grep-color-words'Junio C Hamano2014-10-31
|\ \ \ \ \
| * | | | | grep: add color.grep.matchcontext and color.grep.matchselectedRené Scharfe2014-10-28
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rb/pack-window-memory-config-doc'Junio C Hamano2014-10-29
|\ \ \ \ \
| * | | | | config.txt: pack.windowmemory limit applies per-threadRobert de Bath2014-10-28
* | | | | | Merge branch 'tb/core-filemode-doc'Junio C Hamano2014-10-24
|\ \ \ \ \ \
| * | | | | | core.filemode may need manual actionTorsten Bögershausen2014-10-19
| |/ / / / /
* | | | | | Merge branch 'da/mergetool-meld'Junio C Hamano2014-10-21
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | mergetools/meld: make usage of `--output` configurable and more robustDavid Aguilar2014-10-16
| |/ / / /
* | | | | Merge branch 'da/mergetool-temporary-directory'Junio C Hamano2014-10-21
|\ \ \ \ \
| * | | | | mergetool: add an option for writing to a temporary directoryDavid Aguilar2014-10-16
| | |_|/ / | |/| | |
| * | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-25
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/push-cert'Junio C Hamano2014-10-08
|\ \ \ \ \ \