summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rj/log-decorate-auto'Junio C Hamano2016-05-291-1/+4
|\
| * log: document the --decorate=auto optionrj/log-decorate-autoRamsay Jones2016-05-271-1/+4
* | Merge branch 'pb/commit-verbose-config'Junio C Hamano2016-05-231-0/+4
|\ \
| * | commit: add a commit.verbose config variablepb/commit-verbose-configPranit Bauva2016-05-101-0/+4
* | | Merge branch 'xy/format-patch-base'Junio C Hamano2016-05-231-0/+4
|\ \ \
| * | | format-patch: introduce format.useAutoBase configurationXiaolong Ye2016-04-261-0/+4
* | | | Merge branch 'tb/core-eol-fix'Junio C Hamano2016-05-231-3/+3
|\ \ \ \
| * | | | convert: allow core.autocrlf=input and core.eol=crlfTorsten Bögershausen2016-04-251-3/+3
| |/ / /
* | | | Merge branch 'js/windows-dotgit'Junio C Hamano2016-05-171-0/+6
|\ \ \ \
| * | | | mingw: introduce the 'core.hideDotFiles' settingJohannes Schindelin2016-05-111-0/+6
| |/ / /
* | | | Merge branch 'jc/linkgit-fix'Junio C Hamano2016-05-171-2/+2
|\ \ \ \
| * | | | Documentation: fix linkgit referencesjc/linkgit-fixJunio C Hamano2016-05-091-2/+2
| |/ / /
* | | | Merge branch 'bn/config-doc-tt-varnames'Junio C Hamano2016-05-171-11/+11
|\ \ \ \
| * | | | config: consistently format $variables in monospaced fontbn/config-doc-tt-varnamesBrian Norris2016-05-051-11/+11
* | | | | Merge branch 'jc/config-pathname-type'Junio C Hamano2016-05-171-11/+19
|\ \ \ \ \ | |/ / / /
| * | | | config: describe 'pathname' value typejc/config-pathname-typeJunio C Hamano2016-05-041-11/+19
* | | | | Merge branch 'bn/http-cookiefile-config'Junio C Hamano2016-05-171-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 'dt/log-follow-config' into maintJunio C Hamano2015-10-161-0/+6
| |\ \ \ \
* | \ \ \ \ Merge branch 'ab/hooks'Junio C Hamano2016-05-171-0/+17
|\ \ \ \ \ \
| * | | | | | hooks: allow customizing where the hook directory isÆvar Arnfjörð Bjarmason2016-05-041-0/+17
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ew/doc-split-pack-disables-bitmap'Junio C Hamano2016-05-101-4/+8
|\ \ \ \ \ \
| * | | | | | pack-objects: warn on split packs disabling bitmapsew/doc-split-pack-disables-bitmapEric Wong2016-04-281-4/+8
| |/ / / / /
* | | | | | Merge branch 'js/http-custom-headers'Junio C Hamano2016-05-061-0/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | http: support sending custom HTTP headersJohannes Schindelin2016-04-271-0/+6
| |/ / / /
* | | | | 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
| |/ / / / /