Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with maint | Junio C Hamano | 2017-06-04 | 1 | -0/+69 |
|\ | |||||
| * | Prepare for 2.13.1; more topics to follow | Junio C Hamano | 2017-06-04 | 1 | -0/+69 |
| * | Merge branch 'km/log-showsignature-doc' into maint | Junio C Hamano | 2017-06-04 | 1 | -0/+4 |
| |\ | |||||
| * \ | Merge branch 'jt/push-options-doc' into maint | Junio C Hamano | 2017-06-04 | 2 | -9/+28 |
| |\ \ | |||||
| * \ \ | Merge branch 'jk/update-links-in-docs' into maint | Junio C Hamano | 2017-06-04 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/doc-config-include' into maint | Junio C Hamano | 2017-06-04 | 1 | -10/+21 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ja/do-not-ask-needless-questions' into maint | Junio C Hamano | 2017-06-04 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ab/doc-replace-gmane-links' into maint | Junio C Hamano | 2017-06-04 | 2 | -3/+3 |
| |\ \ \ \ \ \ | |||||
* | | | | | | | | Sixth batch for 2.14 | Junio C Hamano | 2017-06-04 | 1 | -0/+23 |
* | | | | | | | | Merge branch 'jk/url-insteadof-config' | Junio C Hamano | 2017-06-04 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | docs/config: mention protocol implications of url.insteadOfjk/url-insteadof-config | Jeff King | 2017-06-01 | 1 | -0/+7 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ah/doc-rev-parse-short-default' | Junio C Hamano | 2017-06-04 | 2 | -6/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | doc: rewrite description for rev-parse --shortah/doc-rev-parse-short-default | Andreas Heiduk | 2017-06-01 | 2 | -6/+7 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ab/c-translators-comment-style' | Junio C Hamano | 2017-06-04 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | C style: use standard style for "TRANSLATORS" commentsab/c-translators-comment-style | Ævar Arnfjörð Bjarmason | 2017-05-31 | 1 | -5/+5 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ah/doc-filter-branch-export-env' | Junio C Hamano | 2017-06-04 | 1 | -4/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | doc: filter-branch does not require re-export of varsah/doc-filter-branch-export-env | Andreas Heiduk | 2017-05-29 | 1 | -4/+1 |
* | | | | | | | | | Fifth batch for 2.14 | Junio C Hamano | 2017-06-02 | 1 | -0/+24 |
* | | | | | | | | | Merge branch 'ab/grep-preparatory-cleanup' | Junio C Hamano | 2017-06-02 | 2 | -4/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | grep & rev-list doc: stop promising libpcre for --perl-regexp | Ævar Arnfjörð Bjarmason | 2017-05-21 | 2 | -4/+11 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'sl/clean-d-ignored-fix' | Junio C Hamano | 2017-06-02 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | dir: hide untracked contents of untracked dirs | Samuel Lijin | 2017-05-22 | 1 | -0/+6 |
* | | | | | | | | | | Merge branch 'ah/doc-pretty-format-fix' | Junio C Hamano | 2017-06-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Documentation: fix formatting typo in pretty-formats.txtah/doc-pretty-format-fix | Andreas Heiduk | 2017-05-23 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'ah/doc-interpret-trailers-ifexists' | Junio C Hamano | 2017-06-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Documentation: fix reference to ifExists for interpret-trailersah/doc-interpret-trailers-ifexists | Andreas Heiduk | 2017-05-23 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'ab/ref-filter-no-contains' | Junio C Hamano | 2017-06-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | tag: duplicate mention of --contains should mention --no-contains | Ævar Arnfjörð Bjarmason | 2017-05-23 | 1 | -1/+1 |
* | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ |