summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tb/core-eol-fix' into maintJunio C Hamano2016-06-061-3/+3
|\
| * convert: allow core.autocrlf=input and core.eol=crlfTorsten Bögershausen2016-04-251-3/+3
* | Merge branch 'bn/http-cookiefile-config' into maintJunio C Hamano2016-05-311-2/+3
|\ \
| * | http: expand http.cookieFile as a pathbn/http-cookiefile-configBrian Norris2016-05-041-1/+2
| * | Documentation: config: improve word ordering for http.cookieFileBrian Norris2016-05-041-1/+1
* | | Merge branch 'jc/linkgit-fix' into maintJunio C Hamano2016-05-261-2/+2
|\ \ \
| * | | Documentation: fix linkgit referencesjc/linkgit-fixJunio C Hamano2016-05-091-2/+2
| | |/ | |/|
* | | Merge branch 'js/windows-dotgit' into maintJunio C Hamano2016-05-261-0/+6
|\ \ \
| * | | mingw: introduce the 'core.hideDotFiles' settingJohannes Schindelin2016-05-111-0/+6
| |/ /
* | | Merge branch 'bn/config-doc-tt-varnames' into maintJunio C Hamano2016-05-261-21/+29
|\ \ \
| * | | config: consistently format $variables in monospaced fontbn/config-doc-tt-varnamesBrian Norris2016-05-051-11/+11
| * | | config: describe 'pathname' value typejc/config-pathname-typeJunio C Hamano2016-05-041-11/+19
| | |/ | |/|
| * | Merge branch 'dt/log-follow-config' into maintJunio C Hamano2015-10-161-0/+6
| |\ \
* | | | pack-objects: warn on split packs disabling bitmapsew/doc-split-pack-disables-bitmapEric Wong2016-04-281-4/+8
| |_|/ |/| |
* | | Merge branch 'ce/https-public-key-pinning'Junio C Hamano2016-02-241-0/+8
|\ \ \
| * | | http: implement public key pinningce/https-public-key-pinningChristoph Egger2016-02-151-0/+8
* | | | Merge branch 'bc/http-empty-auth'Junio C Hamano2016-02-241-0/+6
|\ \ \ \
| * | | | http: add option to try authentication without usernamebc/http-empty-authbrian m. carlson2016-02-151-0/+6
| |/ / /
* | | | Merge branch 'da/user-useconfigonly'Junio C Hamano2016-02-171-0/+10
|\ \ \ \
| * | | | ident: add user.useConfigOnly boolean for when ident shouldn't be guessedDan Aloni2016-02-081-0/+10
| |/ / /
* | | | Merge branch 'jk/drop-rsync-transport'Junio C Hamano2016-02-171-1/+1
|\ \ \ \
| * | | | transport: drop support for git-over-rsyncjk/drop-rsync-transportJeff King2016-02-011-1/+1
| |/ / /
* | | | Merge branch 'cc/untracked'Junio C Hamano2016-02-101-0/+9
|\ \ \ \
| * | | | config: add core.untrackedCacheChristian Couder2016-01-271-0/+9
* | | | | Merge branch 'kf/http-proxy-auth-methods'Junio C Hamano2016-02-031-3/+33
|\ \ \ \ \
| * | | | | http: use credential API to handle proxy authenticationkf/http-proxy-auth-methodsKnut Franke2016-01-261-3/+7
| * | | | | http: allow selection of proxy authentication methodKnut Franke2016-01-261-0/+26
| | |/ / / | |/| | |
* | | | | Merge branch 'ak/format-patch-odir-config'Junio C Hamano2016-01-261-0/+4
|\ \ \ \ \
| * | | | | format-patch: introduce format.outputDirectory configurationak/format-patch-odir-configAlexander Kuleshov2016-01-131-0/+4
| |/ / / /
* | | | | Merge branch 'js/pull-rebase-i'Junio C Hamano2016-01-261-0/+4
|\ \ \ \ \
| * | | | | pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin2016-01-131-0/+4
| |/ / / /
* | | | | Merge branch 'tg/grep-no-index-fallback'Junio C Hamano2016-01-201-0/+4
|\ \ \ \ \
| * | | | | builtin/grep: add grep.fallbackToNoIndex configtg/grep-no-index-fallbackThomas Gummerer2016-01-121-0/+4
* | | | | | Merge branch 'vl/grep-configurable-threads'Junio C Hamano2016-01-121-0/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | grep: add --threads=<num> option and grep.threads configurationvl/grep-configurable-threadsVictor Leschuk2015-12-161-0/+4
* | | | | | Merge branch 'mc/push-recurse-submodules-config'Junio C Hamano2015-12-211-0/+14
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | push: add recurseSubmodules config optionMike Crowe2015-11-201-0/+14
* | | | | | credential-cache: new option to ignore sighupnp/credential-cache-sighupNoam Postavsky2015-11-201-0/+3
|/ / / / /
* | | | | hideRefs: add support for matching full refsLukas Fleischer2015-11-051-1/+2
* | | | | config.txt: document the semantics of hideRefs with namespacesLukas Fleischer2015-11-051-0/+8
|/ / / /
* | | | Merge branch 'dt/log-follow-config'Junio C Hamano2015-10-151-0/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | log: Update log.follow doc and add to config.txtdt/log-follow-configEric N. Vander Weele2015-10-071-0/+6
* | | | Merge branch 'jk/date-local'Junio C Hamano2015-10-051-3/+1
|\ \ \ \
| * | | | Documentation/config: don't list date formatsJohn Keeping2015-09-031-3/+1
| |/ / /
* | | | Merge branch 'nk/stash-show-config'Junio C Hamano2015-10-051-0/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | stash: allow "stash show" diff output configurablenk/stash-show-configNamhyung Kim2015-08-311-0/+10
* | | | Merge branch 'as/config-doc-markup-fix'Junio C Hamano2015-09-171-6/+6
|\ \ \ \
| * | | | Documentation/config: fix formatting for branch.*.rebase and pull.rebaseas/config-doc-markup-fixAndreas Schwab2015-09-121-6/+6
* | | | | Merge branch 'db/push-sign-if-asked'Junio C Hamano2015-08-311-0/+8
|\ \ \ \ \
| * | | | | push: add a config option push.gpgSign for default signed pushesdb/push-sign-if-askedDave Borowitz2015-08-191-0/+8
| | |_|_|/ | |/| | |