summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'la/tag-force-signing-annotated-tags'Junio C Hamano2016-04-061-0/+5
|\
| * tag: add the option to force signing of annotated tagsla/tag-force-signing-annotated-tagsLaurent Arnoud2016-03-221-0/+5
* | Merge branch 'sb/submodule-parallel-update'Junio C Hamano2016-04-061-0/+6
|\ \
| * | fetching submodules: respect `submodule.fetchJobs` config optionStefan Beller2016-03-011-0/+6
* | | Merge branch 'jk/add-i-highlight'Junio C Hamano2016-04-031-0/+8
|\ \ \
| * | | add--interactive: allow custom diff highlighting programsjk/add-i-highlightJeff King2016-02-281-0/+8
| | |/ | |/|
* | | credential: let empty credential specs reset helper listjk/credential-clear-configJeff King2016-02-261-2/+3
|/ /
* | 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
| | |_|_|/ | |/| | |
| * | | | Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano2015-06-251-1/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-051-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano2015-06-051-5/+5
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'jk/notes-merge-config'Junio C Hamano2015-08-311-2/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-configJacob Keller2015-08-171-0/+6
| * | | | | | | | notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-171-0/+6
| * | | | | | | | notes: document cat_sort_uniq rewriteModeJacob Keller2015-08-171-2/+2
| | |_|_|_|_|/ / | |/| | | | | |