aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
Commit message (Expand)AuthorAge
* Merge branch 'jn/ssh-wrappers'Junio C Hamano2017-12-06
|\
| * ssh: 'auto' variant to select between 'ssh' and 'simple'Jonathan Nieder2017-11-21
* | Merge branch 'bw/protocol-v1'Junio C Hamano2017-12-06
|\ \ | |/
| * ssh: introduce a 'simple' ssh variantBrandon Williams2017-10-17
| * protocol: introduce protocol extension mechanismsBrandon Williams2017-10-17
* | Merge branch 'rv/sendemail-tocmd-in-config-and-completion'Junio C Hamano2017-11-27
|\ \
| * | Documentation/config: add sendemail.tocmd to list preceding "See git-send-ema...Rasmus Villemoes2017-11-14
* | | Merge branch 'bp/fsmonitor'Junio C Hamano2017-11-21
|\ \ \ | |/ / |/| |
| * | fsmonitor: add documentation for the fsmonitor extension.Ben Peart2017-10-01
| |/
* | Merge branch 'sb/blame-config-doc'Junio C Hamano2017-11-09
|\ \
| * | config: document blame configurationStefan Beller2017-11-06
* | | Merge branch 'mp/push-pushoption-config'Junio C Hamano2017-11-06
|\ \ \
| * | | builtin/push.c: add push.pushOption configMarius Paliga2017-10-24
| * | | Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano2017-10-18
| |\ \ \
| | * | | Revert "color: make "always" the same as "auto" in config"Jeff King2017-10-17
| | * | | Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Junio C Hamano2017-10-17
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'jk/doc-the-this' into maintJunio C Hamano2017-09-10
| | |\ \ \
| | * \ \ \ Merge branch 'ah/doc-empty-string-is-false' into maintJunio C Hamano2017-09-10
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autoJunio C Hamano2017-10-04
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | color: make "always" the same as "auto" in configJeff King2017-10-04
| | |/ / / /
* | | | | | run-command: add hint when a hook is ignoredDamien Marié2017-10-10
|/ / / / /
* | | | | Documentation/config: clarify the meaning of submodule.<name>.updateStefan Beller2017-09-24
| |_|_|/ |/| | |
* | | | Merge branch 'mh/ref-lock-entry'Junio C Hamano2017-08-26
|\ \ \ \
| * | | | refs: retry acquiring reference locks for 100msMichael Haggerty2017-08-23
| |/ / /
* | | | Merge branch 'jc/cutoff-config'Junio C Hamano2017-08-26
|\ \ \ \
| * | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedJunio C Hamano2017-08-22
| |/ / /
* | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-08-26
|\ \ \ \
| * | | | diff: document the new --color-moved settingStefan Beller2017-06-30
* | | | | Merge branch 'jk/doc-the-this'Junio C Hamano2017-08-24
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | doc: fix typo in sendemail.identityJeff King2017-08-20
* | | | | Merge branch 'ah/doc-empty-string-is-false'Junio C Hamano2017-08-23
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | doc: clarify "config --bool" behaviour with empty stringAndreas Heiduk2017-08-14
* | | | Merge branch 'xz/send-email-batch-size'Junio C Hamano2017-07-06
|\ \ \ \ | |_|_|/ |/| | |
| * | | send-email: --batch-size to work around some SMTP server limitxiaoqiang zhao2017-07-05
* | | | Merge branch 'dt/raise-core-packed-git-limit'Junio C Hamano2017-06-26
|\ \ \ \
| * | | | docs: update 64-bit core.packedGitLimit defaultJeff King2017-06-21
| |/ / /
* | | | Merge branch 'lb/status-stash-count'Junio C Hamano2017-06-26
|\ \ \ \
| * | | | status: add optional stash count informationLiam Beguin2017-06-18
| * | | | stash: update documentation to use 'stash entry'Liam Beguin2017-06-18
* | | | | Merge branch 'jk/warn-add-gitlink'Junio C Hamano2017-06-24
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add: warn when adding an embedded repositoryJeff King2017-06-15
* | | | | Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano2017-06-13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Introduce 'submodule.recurse' option for worktree manipulatorsStefan Beller2017-06-01
* | | | | Merge branch 'jk/url-insteadof-config'Junio C Hamano2017-06-04
|\ \ \ \ \
| * | | | | docs/config: mention protocol implications of url.insteadOfJeff King2017-06-01
| | |/ / / | |/| | |
* | | | | Merge branch 'ah/doc-rev-parse-short-default'Junio C Hamano2017-06-04
|\ \ \ \ \
| * | | | | doc: rewrite description for rev-parse --shortAndreas Heiduk2017-06-01
| |/ / / /
* | | | | Merge branch 'ab/conditional-config-with-symlinks'Junio C Hamano2017-05-30
|\ \ \ \ \
| * | | | | config: match both symlink & realpath versions in IncludeIf.gitdir:*Ævar Arnfjörð Bjarmason2017-05-17
| |/ / / /
* | | | | Merge branch 'km/log-showsignature-doc'Junio C Hamano2017-05-29
|\ \ \ \ \