Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bw/doc-submodule-recurse-config-with-clone' | Junio C Hamano | 2018-03-06 | 1 | -1/+2 |
|\ | |||||
| * | submodule: indicate that 'submodule.recurse' doesn't apply to clone | Brandon Williams | 2018-02-21 | 1 | -1/+2 |
* | | Merge branch 'ab/fetch-prune' | Junio C Hamano | 2018-03-06 | 1 | -1/+19 |
|\ \ | |||||
| * | | fetch: add a --prune-tags option and fetch.pruneTags config | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -0/+14 |
| * | | git-fetch & config doc: link to the new PRUNING section | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -1/+5 |
| |/ | |||||
* | | Merge branch 'jh/partial-clone' | Junio C Hamano | 2018-02-13 | 1 | -0/+4 |
|\ \ | |/ |/| | |||||
| * | upload-pack: add object filtering for partial clone | Jeff Hostetler | 2017-12-08 | 1 | -0/+4 |
* | | Merge branch 'db/doc-config-section-names-with-bs' | Junio C Hamano | 2018-01-05 | 1 | -5/+7 |
|\ \ | |||||
| * | | config.txt: document behavior of backslashes in subsections | Dave Borowitz | 2017-12-22 | 1 | -5/+7 |
* | | | Merge branch 'sr/http-sslverify-config-doc' | Junio C Hamano | 2017-12-28 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | config: document default value of http.sslVerify | Simon Ruderich | 2017-12-18 | 1 | -2/+2 |
* | | | | Merge branch 'lb/rebase-i-short-command-names' | Junio C Hamano | 2017-12-27 | 1 | -30/+1 |
|\ \ \ \ | |||||
| * | | | | Documentation: move rebase.* configs to new file | Liam Beguin | 2017-12-04 | 1 | -30/+1 |
* | | | | | Merge branch 'ls/editor-waiting-message' | Junio C Hamano | 2017-12-19 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | launch_editor(): indicate that Git waits for user input | Lars Schneider | 2017-12-07 | 1 | -0/+3 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'sb/blame-config-doc' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+17 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'tg/worktree-create-tracking' | Junio C Hamano | 2017-12-19 | 1 | -0/+10 |
|\ \ \ \ \ | |||||
| * | | | | | add worktree.guessRemote config option | Thomas Gummerer | 2017-12-06 | 1 | -0/+10 |
* | | | | | | Merge branch 'jn/ssh-wrappers' | Junio C Hamano | 2017-12-06 | 1 | -10/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ssh: 'auto' variant to select between 'ssh' and 'simple' | Jonathan Nieder | 2017-11-21 | 1 | -10/+16 |
* | | | | | | | Merge branch 'bw/protocol-v1' | Junio C Hamano | 2017-12-06 | 1 | -4/+40 |
|\| | | | | | | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | ssh: introduce a 'simple' ssh variant | Brandon Williams | 2017-10-17 | 1 | -4/+23 |
| * | | | | | protocol: introduce protocol extension mechanisms | Brandon Williams | 2017-10-17 | 1 | -0/+17 |
* | | | | | | Merge branch 'rv/sendemail-tocmd-in-config-and-completion' | Junio C Hamano | 2017-11-27 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Documentation/config: add sendemail.tocmd to list preceding "See git-send-ema... | Rasmus Villemoes | 2017-11-14 | 1 | -0/+1 |
* | | | | | | Merge branch 'bp/fsmonitor' | Junio C Hamano | 2017-11-21 | 1 | -0/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | fsmonitor: add documentation for the fsmonitor extension. | Ben Peart | 2017-10-01 | 1 | -0/+7 |
| |/ / / / | |||||
* | | | | | Merge branch 'sb/blame-config-doc' | Junio C Hamano | 2017-11-09 | 1 | -0/+17 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | config: document blame configuration | Stefan Beller | 2017-11-06 | 1 | -0/+17 |
* | | | | | Merge branch 'mp/push-pushoption-config' | Junio C Hamano | 2017-11-06 | 1 | -0/+29 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/push.c: add push.pushOption config | Marius Paliga | 2017-10-24 | 1 | -0/+29 |
| | |_|/ / | |/| | | | |||||
| * | | | | 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 |
| | |/ / / / / | |||||
* | / / / / / | run-command: add hint when a hook is ignored | Damien Marié | 2017-10-10 | 1 | -0/+3 |
|/ / / / / / | |||||
* | | | / / | 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 |