summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/conf-var-doc'Junio C Hamano2015-02-221-8/+7
|\
| * config.txt: mark deprecated variables more prominentlyJunio C Hamano2015-01-281-4/+4
| * config.txt: clarify that add.ignore-errors is deprecatedJunio C Hamano2015-01-281-5/+4
* | Merge branch 'jc/push-to-checkout'Junio C Hamano2015-02-111-1/+5
|\ \
| * | receive-pack: support push-to-checkout hookjc/push-to-checkoutJunio C Hamano2015-01-081-1/+5
* | | Merge branch 'sb/atomic-push'Junio C Hamano2015-02-111-0/+5
|\ \ \
| * | | Document receive.advertiseatomicStefan Beller2015-01-141-0/+5
* | | | Merge branch 'po/doc-core-ignorestat'Junio C Hamano2015-01-141-8/+13
|\ \ \ \
| * | | | doc: core.ignoreStat update, and clarify the --assume-unchanged effectpo/doc-core-ignorestatPhilip Oakley2015-01-121-9/+13
| * | | | doc: core.ignoreStat clarify the --assume-unchanged effectPhilip Oakley2014-12-121-4/+5
* | | | | Merge branch 'lh/send-email-hide-x-mailer'Junio C Hamano2015-01-071-0/+1
|\ \ \ \ \
| * | | | | send-email: add --[no-]xmailer optionLuis Henriques2014-12-151-0/+1
* | | | | | Merge branch 'jk/colors'Junio C Hamano2014-12-221-2/+4
|\ \ \ \ \ \
| * | | | | | parse_color: recognize "no$foo" to clear the $foo attributeJeff King2014-11-201-1/+2
| * | | | | | parse_color: support 24-bit RGB valuesJeff King2014-11-201-1/+2
* | | | | | | Merge branch 'js/push-to-deploy'Junio C Hamano2014-12-221-0/+7
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | receive-pack: add another option for receive.denyCurrentBranchJohannes Schindelin2014-11-301-0/+7
* | | | | | | Merge branch 'pb/send-email-te'Junio C Hamano2014-12-221-0/+1
|\ \ \ \ \ \ \
| * | | | | | | git-send-email: add --transfer-encoding optionpb/send-email-tePaolo Bonzini2014-11-251-0/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Sync with v2.2.1Junio C Hamano2014-12-181-0/+11
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Sync with v2.1.4Junio C Hamano2014-12-171-0/+11
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Sync with v2.0.5Junio C Hamano2014-12-171-0/+11
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Sync with v1.9.5Junio C Hamano2014-12-171-0/+11
| | | |\ \ \
| | | | * \ \ Sync with v1.8.5.6Junio C Hamano2014-12-171-0/+11
| | | | |\ \ \
| | | | | * | | read-cache: optionally disallow NTFS .git variantsJohannes Schindelin2014-12-171-0/+6
| | | | | * | | read-cache: optionally disallow HFS+ .git variantsJeff King2014-12-171-0/+5
* | | | | | | | Merge branch 'jk/colors-fix'Junio C Hamano2014-12-121-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | docs: describe ANSI 256-color modeJeff King2014-11-201-0/+4
| |/ / / / /
* | | | | | Sync with maintJunio C Hamano2014-11-101-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Documentation/config.txt: fix minor typoThomas Quinot2014-11-101-1/+1
| * | | | config.txt: fix typoNicolas Dermine2014-11-101-1/+1
* | | | | Documentation: typofixesThomas Ackermann2014-11-041-5/+5
* | | | | Merge branch 'rs/grep-color-words'Junio C Hamano2014-10-311-1/+5
|\ \ \ \ \
| * | | | | grep: add color.grep.matchcontext and color.grep.matchselectedrs/grep-color-wordsRené Scharfe2014-10-281-1/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rb/pack-window-memory-config-doc'Junio C Hamano2014-10-291-4/+5
|\ \ \ \ \
| * | | | | config.txt: pack.windowmemory limit applies per-threadrb/pack-window-memory-config-docRobert de Bath2014-10-281-4/+5
* | | | | | Merge branch 'tb/core-filemode-doc'Junio C Hamano2014-10-241-6/+19
|\ \ \ \ \ \
| * | | | | | core.filemode may need manual actiontb/core-filemode-docTorsten Bögershausen2014-10-191-6/+19
| |/ / / / /
* | | | | | Merge branch 'da/mergetool-meld'Junio C Hamano2014-10-211-0/+9
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | mergetools/meld: make usage of `--output` configurable and more robustda/mergetool-meldDavid Aguilar2014-10-161-0/+9
| |/ / / /
* | | | | Merge branch 'da/mergetool-temporary-directory'Junio C Hamano2014-10-211-0/+6
|\ \ \ \ \
| * | | | | mergetool: add an option for writing to a temporary directoryDavid Aguilar2014-10-161-0/+6
| | |_|/ / | |/| | |
| * | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-251-2/+6
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/push-cert'Junio C Hamano2014-10-081-0/+19
|\ \ \ \ \ \
| * | | | | | signed push: allow stale nonce in stateless modeJunio C Hamano2014-09-171-0/+13
| * | | | | | signed push: fortify against replay attacksJunio C Hamano2014-09-171-6/+6
| * | | | | | push: the beginning of "git push --signed"Junio C Hamano2014-09-151-0/+6
| | |_|/ / / | |/| | | |
* | | | | | diff --stat: mark any file larger than core.bigfilethreshold binaryNguyễn Thái Ngọc Duy2014-08-181-1/+2
|/ / / / /
* | | | | Merge branch 'jk/tag-sort'Junio C Hamano2014-07-231-0/+5
|\ \ \ \ \
| * | | | | tag: support configuring --sort via .gitconfigjk/tag-sortJacob Keller2014-07-171-0/+5
View Lorry Controller Status