Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fourth batch for 2.14 | Junio C Hamano | 2017-05-30 | 1 | -0/+55 |
* | 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:*ab/conditional-config-with-symlinks | Ævar Arnfjörð Bjarmason | 2017-05-17 | 1 | -0/+10 |
* | | Merge branch 'jt/send-email-validate-hook' | Junio C Hamano | 2017-05-30 | 2 | -0/+9 |
|\ \ | |||||
| * | | send-email: support validate hook | Jonathan Tan | 2017-05-16 | 2 | -0/+9 |
* | | | Merge branch 'bp/sub-process-convert-filter' | Junio C Hamano | 2017-05-30 | 1 | -0/+59 |
|\ \ \ | |||||
| * | | | sub-process: move sub-process functions into separate files | Ben Peart | 2017-05-15 | 1 | -0/+59 |
* | | | | Third batch for 2.14 | Junio C Hamano | 2017-05-29 | 1 | -0/+93 |
* | | | | Merge branch 'km/log-showsignature-doc' | Junio C Hamano | 2017-05-29 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | config.txt: add an entry for log.showSignaturekm/log-showsignature-doc | Kyle Meyer | 2017-05-20 | 1 | -0/+4 |
* | | | | | Merge branch 'jk/update-links-in-docs' | Junio C Hamano | 2017-05-29 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | doc: use https links to Wikipedia to avoid http redirectsjk/update-links-in-docs | Sven Strickroth | 2017-05-15 | 1 | -1/+1 |
* | | | | | | Merge branch 'ja/do-not-ask-needless-questions' | Junio C Hamano | 2017-05-29 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | read-tree -m: make error message for merging 0 trees less smart aleck | Jean-Noel Avila | 2017-05-12 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jk/doc-config-include' | Junio C Hamano | 2017-05-29 | 1 | -10/+21 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | docs/config: consistify include.path examplesjk/doc-config-include | 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 descriptionsg/core-filemode-doc-typofix | SZEDER Gábor | 2017-05-26 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jc/repack-threads' | Junio C Hamano | 2017-05-29 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | repack: accept --threads=<n> and pass it down to pack-objectsjc/repack-threads | Junio C Hamano | 2017-04-27 | 1 | -1/+4 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Second batch for 2.14 | Junio C Hamano | 2017-05-23 | 1 | -0/+29 |
* | | | | | | | | Merge branch 'jt/push-options-doc' | Junio C Hamano | 2017-05-23 | 2 | -9/+28 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | receive-pack: verify push options in certjt/push-options-doc | Jonathan Tan | 2017-05-10 | 1 | -6/+26 |
| * | | | | | | | | docs: correct receive.advertisePushOptions default | Jonathan Tan | 2017-05-09 | 1 | -3/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ab/doc-replace-gmane-links' | Junio C Hamano | 2017-05-23 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | doc: replace more gmane linksab/doc-replace-gmane-links | Junio C Hamano | 2017-05-09 | 1 | -1/+1 |
| * | | | | | | | | doc: replace a couple of broken gmane links | Ævar Arnfjörð Bjarmason | 2017-05-08 | 2 | -2/+2 |
* | | | | | | | | | Start post 2.13 cycle | Junio C Hamano | 2017-05-16 | 1 | -0/+97 |
* | | | | | | | | | Merge branch 'js/larger-timestamps' | Junio C Hamano | 2017-05-16 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | timestamp_t: a new data type for timestamps | Johannes Schindelin | 2017-04-27 | 1 | -4/+4 |
* | | | | | | | | | | Merge branch 'jn/credential-doc-on-clear' | Junio C Hamano | 2017-05-16 | 1 | -10/+10 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | credential doc: make multiple-helper behavior more prominentjn/credential-doc-on-clear | Jonathan Nieder | 2017-05-02 | 1 | -10/+10 |
* | | | | | | | | | | | Merge branch 'ab/clone-no-tags' | Junio C Hamano | 2017-05-16 | 1 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | clone: add a --no-tags option to clone without tags | Ævar Arnfjörð Bjarmason | 2017-05-01 | 1 | -1/+13 |
* | | | | | | | | | | | | Merge branch 'sk/status-short-branch-color-config' | Junio C Hamano | 2017-05-16 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | status: add color config slots for branch info in "--short --branch"sk/status-short-branch-color-config | Stephen Kent | 2017-04-28 | 1 | -1/+4 |
* | | | | | | | | | | | | Git 2.13v2.13.0 | Junio C Hamano | 2017-05-09 | 2 | -0/+13 |
* | | | | | | | | | | | | Sync with v2.12.3 | Junio C Hamano | 2017-05-08 | 10 | -10/+115 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Git 2.12.3v2.12.3 | Junio C Hamano | 2017-05-05 | 2 | -3/+11 |
| * | | | | | | | | | | Merge branch 'maint-2.11' into maint | Junio C Hamano | 2017-05-05 | 9 | -7/+104 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Git 2.11.2v2.11.2 | Junio C Hamano | 2017-05-05 | 2 | -1/+14 |
| | * | | | | | | | | | Merge branch 'maint-2.10' into maint-2.11 | Junio C Hamano | 2017-05-05 | 8 | -7/+91 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | Git 2.10.3v2.10.3 | Junio C Hamano | 2017-05-05 | 2 | -1/+9 |
| | | * | | | | | | | | Merge branch 'maint-2.9' into maint-2.10 | Junio C Hamano | 2017-05-05 | 7 | -6/+82 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Git 2.9.4v2.9.4 | Junio C Hamano | 2017-05-05 | 2 | -1/+10 |
| | | | * | | | | | | | | Merge branch 'maint-2.8' into maint-2.9 | Junio C Hamano | 2017-05-05 | 6 | -5/+73 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | Git 2.8.5v2.8.5 | Junio C Hamano | 2017-05-05 | 2 | -1/+14 |