Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'cn/diff-indent-no-longer-is-experimental' | Junio C Hamano | 2017-11-06 | 4 | -9/+6 |
|\ | |||||
| * | diff: --indent-heuristic is no longer experimentalcn/diff-indent-no-longer-is-experimental | Carlos Martín Nieto | 2017-11-02 | 4 | -9/+6 |
* | | Hopefully final batch before 2.15 | Junio C Hamano | 2017-10-28 | 1 | -0/+7 |
* | | Merge branch 'sg/rev-list-doc-reorder-fix' | Junio C Hamano | 2017-10-28 | 1 | -3/+3 |
|\ \ | |||||
| * | | rev-list-options.txt: use correct directional referencesg/rev-list-doc-reorder-fix | SZEDER Gábor | 2017-10-27 | 1 | -3/+3 |
* | | | Merge branch 'sb/rev-parse-show-superproject-root' | Junio C Hamano | 2017-10-28 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | docs: fix formatting of rev-parse's --show-superproject-working-treesb/rev-parse-show-superproject-root | Sebastian Schuberth | 2017-10-27 | 1 | -1/+1 |
* | | | | Merge branch 'np/config-path-doc' | Junio C Hamano | 2017-10-28 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | config doc: clarify "git config --path" examplenp/config-path-doc | Nathan Payre | 2017-10-19 | 1 | -4/+4 |
* | | | | | Sync with 2.14.3 | Junio C Hamano | 2017-10-23 | 1 | -0/+24 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Git 2.14.3v2.14.3maint-2.14 | Junio C Hamano | 2017-10-23 | 1 | -0/+24 |
| * | | | | Merge branch 'jc/fetch-refspec-doc-update' into maint | Junio C Hamano | 2017-10-23 | 1 | -2/+4 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
* | | | | | Git 2.15-rc2v2.15.0-rc2 | Junio C Hamano | 2017-10-19 | 1 | -0/+12 |
* | | | | | Merge branch 'jc/branch-force-doc-readability-fix' | Junio C Hamano | 2017-10-19 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | branch doc: sprinkle a few commas for readabilityjc/branch-force-doc-readability-fix | Junio C Hamano | 2017-10-18 | 1 | -2/+2 |
* | | | | | | Merge branch 'dg/filter-branch-filter-order-doc' | Junio C Hamano | 2017-10-19 | 1 | -10/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | doc: list filter-branch subdirectory-filter firstdg/filter-branch-filter-order-doc | David Glasser | 2017-10-18 | 1 | -10/+10 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jc/fetch-refspec-doc-update' | Junio C Hamano | 2017-10-19 | 1 | -2/+4 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | fetch doc: src side of refspec could be full SHA-1jc/fetch-refspec-doc-update | Junio C Hamano | 2017-10-18 | 1 | -2/+4 |
* | | | | | | Merge branch 'wk/merge-options-gpg-sign-doc' | Junio C Hamano | 2017-10-19 | 2 | -6/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'wk/merge-options-gpg-sign-doc | W. Trevor King | 2017-10-12 | 2 | -6/+6 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Sync with maint | Junio C Hamano | 2017-10-18 | 2 | -46/+75 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Prepare for 2.14.3 | Junio C Hamano | 2017-10-18 | 1 | -0/+75 |
| * | | | | | Merge branch 'jk/ref-filter-colors-fix' into maint | Junio C Hamano | 2017-10-18 | 2 | -0/+10 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jc/doc-checkout' into maint | Junio C Hamano | 2017-10-18 | 1 | -14/+16 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'ad/doc-markup-fix' into maint | Junio C Hamano | 2017-10-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'mr/doc-negative-pathspec' into maint | Junio C Hamano | 2017-10-18 | 4 | -1/+12 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'ks/doc-use-camelcase-for-config-name' into maint | Junio C Hamano | 2017-10-18 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/doc-read-tree-table-asciidoctor-fix' into maint | Junio C Hamano | 2017-10-18 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ez/doc-duplicated-words-fix' into maint | Junio C Hamano | 2017-10-18 | 4 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kd/doc-for-each-ref' into maint | Junio C Hamano | 2017-10-18 | 1 | -16/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bb/doc-eol-dirty' into maint | Junio C Hamano | 2017-10-18 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/merge-x-theirs-docfix' into maint | Junio C Hamano | 2017-10-18 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Preparing for rc2 continues | Junio C Hamano | 2017-10-18 | 1 | -3/+2 |
* | | | | | | | | | | | | | | | 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 | 3 | -18/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Crawling towards -rc2 | Junio C Hamano | 2017-10-17 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | Merge branch 'jc/doc-checkout' | Junio C Hamano | 2017-10-17 | 1 | -14/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | checkout doc: clarify command line args for "checkout paths" modejc/doc-checkout | Junio C Hamano | 2017-10-11 | 1 | -14/+16 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Git 2.15-rc1v2.15.0-rc1 | Junio C Hamano | 2017-10-11 | 1 | -0/+17 |
* | | | | | | | | | | | | | | Merge branch 'hn/string-list-doc' | Junio C Hamano | 2017-10-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | api-argv-array.txt: remove broken link to string-list APIhn/string-list-doc | Todd Zullinger | 2017-10-06 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | Merge branch 'tb/show-trailers-in-ref-filter' | Junio C Hamano | 2017-10-11 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | ref-filter.c: use trailer_opts to format trailers | Taylor Blau | 2017-10-02 | 1 | -1/+4 |
| * | | | | | | | | | | | | | | | doc: use "`<literal>`"-style quoting for literal strings | Taylor Blau | 2017-10-02 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | doc: 'trailers' is the preferred way to format trailers | Taylor Blau | 2017-10-02 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | Merge branch 'jr/hash-migration-plan-doc' | Junio C Hamano | 2017-10-11 | 2 | -0/+798 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | technical doc: add a design doc for hash function transitionjr/hash-migration-plan-doc | Jonathan Nieder | 2017-09-28 | 2 | -0/+798 |
* | | | | | | | | | | | | | | | | | Prepare for -rc1 | Junio C Hamano | 2017-10-07 | 1 | -3/+38 |