Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/ref-filter-colors-fix' | Junio C Hamano | 2017-10-18 | 1 | -17/+18 |
|\ | |||||
| * | Revert "color: make "always" the same as "auto" in config" | Jeff King | 2017-10-17 | 1 | -17/+18 |
| * | Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt... | Junio C Hamano | 2017-10-17 | 1 | -18/+17 |
| |\ | |||||
| * \ | Merge branch 'jk/doc-the-this' into maint | Junio C Hamano | 2017-09-10 | 1 | -2/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'ah/doc-empty-string-is-false' into maint | Junio C Hamano | 2017-09-10 | 1 | -5/+5 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-auto | Junio C Hamano | 2017-10-04 | 1 | -18/+17 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | color: make "always" the same as "auto" in config | Jeff King | 2017-10-04 | 1 | -18/+17 |
| |/ / / | |||||
* | | | | Documentation/config: clarify the meaning of submodule.<name>.update | Stefan Beller | 2017-09-24 | 1 | -4/+8 |
* | | | | Merge branch 'mh/ref-lock-entry' | Junio C Hamano | 2017-08-27 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | refs: retry acquiring reference locks for 100ms | Michael Haggerty | 2017-08-23 | 1 | -0/+6 |
| |/ / / | |||||
* | | | | Merge branch 'jc/cutoff-config' | Junio C Hamano | 2017-08-27 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved | Junio C Hamano | 2017-08-22 | 1 | -0/+2 |
| |/ / / | |||||
* | | | | Merge branch 'sb/diff-color-move' | Junio C Hamano | 2017-08-27 | 1 | -2/+13 |
|\ \ \ \ | |||||
| * | | | | diff: document the new --color-moved setting | Stefan Beller | 2017-06-30 | 1 | -2/+13 |
* | | | | | Merge branch 'jk/doc-the-this' | Junio C Hamano | 2017-08-24 | 1 | -2/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | doc: fix typo in sendemail.identity | Jeff King | 2017-08-20 | 1 | -2/+2 |
* | | | | | Merge branch 'ah/doc-empty-string-is-false' | Junio C Hamano | 2017-08-23 | 1 | -5/+5 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | doc: clarify "config --bool" behaviour with empty string | Andreas Heiduk | 2017-08-15 | 1 | -5/+5 |
* | | | | Merge branch 'xz/send-email-batch-size' | Junio C Hamano | 2017-07-07 | 1 | -0/+10 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | send-email: --batch-size to work around some SMTP server limit | xiaoqiang zhao | 2017-07-05 | 1 | -0/+10 |
* | | | | Merge branch 'dt/raise-core-packed-git-limit' | Junio C Hamano | 2017-06-26 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | docs: update 64-bit core.packedGitLimit default | Jeff King | 2017-06-21 | 1 | -1/+2 |
| |/ / / | |||||
* | | | | Merge branch 'lb/status-stash-count' | Junio C Hamano | 2017-06-26 | 1 | -3/+8 |
|\ \ \ \ | |||||
| * | | | | status: add optional stash count information | Liam Beguin | 2017-06-19 | 1 | -0/+5 |
| * | | | | stash: update documentation to use 'stash entry' | Liam Beguin | 2017-06-19 | 1 | -3/+3 |
* | | | | | Merge branch 'jk/warn-add-gitlink' | Junio C Hamano | 2017-06-24 | 1 | -0/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | add: warn when adding an embedded repository | Jeff King | 2017-06-15 | 1 | -0/+3 |
* | | | | | Merge branch 'sb/submodule-blanket-recursive' | Junio C Hamano | 2017-06-13 | 1 | -0/+5 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Introduce 'submodule.recurse' option for worktree manipulators | Stefan Beller | 2017-06-01 | 1 | -0/+5 |
* | | | | | Merge branch 'jk/url-insteadof-config' | Junio C Hamano | 2017-06-04 | 1 | -0/+7 |
|\ \ \ \ \ | |||||
| * | | | | | docs/config: mention protocol implications of url.insteadOf | Jeff King | 2017-06-01 | 1 | -0/+7 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'ah/doc-rev-parse-short-default' | Junio C Hamano | 2017-06-04 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | doc: rewrite description for rev-parse --short | Andreas Heiduk | 2017-06-01 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'ab/conditional-config-with-symlinks' | Junio C Hamano | 2017-05-30 | 1 | -0/+10 |
|\ \ \ \ \ | |||||
| * | | | | | config: match both symlink & realpath versions in IncludeIf.gitdir:* | Ævar Arnfjörð Bjarmason | 2017-05-17 | 1 | -0/+10 |
| |/ / / / | |||||
* | | | | | Merge branch 'km/log-showsignature-doc' | Junio C Hamano | 2017-05-29 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | config.txt: add an entry for log.showSignature | Kyle Meyer | 2017-05-20 | 1 | -0/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'jk/doc-config-include' | Junio C Hamano | 2017-05-29 | 1 | -10/+21 |
|\ \ \ \ \ | |||||
| * | | | | | docs/config: consistify include.path examples | Jeff King | 2017-05-12 | 1 | -2/+2 |
| * | | | | | docs/config: avoid the term "expand" for includes | Jeff King | 2017-05-12 | 1 | -4/+4 |
| * | | | | | docs/config: give a relative includeIf example | Jeff King | 2017-05-12 | 1 | -0/+6 |
| * | | | | | docs/config: clarify include/includeIf relationship | Jeff King | 2017-05-12 | 1 | -6/+11 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'sg/core-filemode-doc-typofix' | Junio C Hamano | 2017-05-29 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | docs/config.txt: fix indefinite article in core.fileMode description | SZEDER Gábor | 2017-05-26 | 1 | -1/+1 |
* | | | | | Merge branch 'jt/push-options-doc' | Junio C Hamano | 2017-05-23 | 1 | -3/+2 |
|\ \ \ \ \ | |||||
| * | | | | | docs: correct receive.advertisePushOptions default | Jonathan Tan | 2017-05-09 | 1 | -3/+2 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'km/config-grammofix' into maint | Junio C Hamano | 2017-03-28 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ab/push-default-doc-fix' into maint | Junio C Hamano | 2017-03-24 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'dt/gc-ignore-old-gc-logs' into maint | Junio C Hamano | 2017-03-21 | 1 | -0/+6 |
| |\ \ \ \ \ \ | |||||
* | | | | | | | | status: add color config slots for branch info in "--short --branch" | Stephen Kent | 2017-04-28 | 1 | -1/+4 |
| |_|_|_|_|/ / |/| | | | | | |