Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | Merge branch 'jk/ui-color-always-to-auto' | Junio C Hamano | 2017-10-07 | 3 | -18/+27 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autojk/ui-color-always-to-auto | Junio C Hamano | 2017-10-04 | 3 | -18/+27 |
| |\ \ \ \ | |||||
| | * | | | | color: make "always" the same as "auto" in config | Jeff King | 2017-10-04 | 1 | -18/+17 |
| | * | | | | provide --color option for all ref-filter users | Jeff King | 2017-10-04 | 2 | -0/+10 |
* | | | | | | Git 2.15-rc0v2.15.0-rc0 | Junio C Hamano | 2017-10-05 | 1 | -0/+16 |
|/ / / / / | |||||
* | | | | | The twelfth batch for 2.15 | Junio C Hamano | 2017-10-03 | 1 | -0/+24 |
* | | | | | Merge branch 'ad/doc-markup-fix' | Junio C Hamano | 2017-10-03 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | doc: correct command formattingad/doc-markup-fix | Adam Dinwoodie | 2017-09-29 | 1 | -1/+1 |
* | | | | | | Merge branch 'mr/doc-negative-pathspec' | Junio C Hamano | 2017-10-03 | 4 | -1/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | docs: improve discoverability of exclude pathspecmr/doc-negative-pathspec | Manav Rathi | 2017-09-25 | 4 | -1/+12 |
* | | | | | | | Merge branch 'jk/no-optional-locks' | Junio C Hamano | 2017-10-03 | 1 | -0/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git: add --no-optional-locks option | Jeff King | 2017-09-27 | 1 | -0/+12 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'hn/string-list-doc' | Junio C Hamano | 2017-10-03 | 1 | -209/+0 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | string-list.h: move documentation from Documentation/api/ into header | Han-Wen Nienhuys | 2017-09-27 | 1 | -209/+0 |
* | | | | | | | Merge branch 'sd/branch-copy' | Junio C Hamano | 2017-10-03 | 1 | -1/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | branch: add a --copy (-c) option to go with --move (-m) | Sahil Dua | 2017-06-18 | 1 | -1/+13 |
* | | | | | | | | Merge branch 'js/rebase-i-final' | Junio C Hamano | 2017-10-03 | 1 | -7/+9 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | rebase -i: rearrange fixup/squash lines using the rebase--helper | Johannes Schindelin | 2017-07-27 | 1 | -7/+9 |
* | | | | | | | | The eleventh batch for 2.15 | Junio C Hamano | 2017-09-29 | 1 | -0/+18 |
* | | | | | | | | Merge branch 'sb/doc-config-submodule-update' | Junio C Hamano | 2017-09-29 | 1 | -4/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation/config: clarify the meaning of submodule.<name>.updatesb/doc-config-submodule-update | Stefan Beller | 2017-09-24 | 1 | -4/+8 |
* | | | | | | | | | Merge branch 'sb/merge-commit-msg-hook' | Junio C Hamano | 2017-09-29 | 1 | -5/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation/githooks: mention merge in commit-msg hooksb/merge-commit-msg-hook | Stefan Beller | 2017-09-22 | 1 | -5/+4 |
* | | | | | | | | | | Merge branch 'mk/describe-match-with-all' | Junio C Hamano | 2017-09-29 | 1 | -10/+14 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | describe: teach --match to handle branches and remotesmk/describe-match-with-all | Max Kirillov | 2017-09-20 | 1 | -10/+14 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | The tenth batch for 2.15 | Junio C Hamano | 2017-09-28 | 1 | -0/+47 |
* | | | | | | | | | Merge branch 'jc/merge-x-theirs-docfix' | Junio C Hamano | 2017-09-28 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | merge-strategies: avoid implying that "-s theirs" existsjc/merge-x-theirs-docfix | Junio C Hamano | 2017-09-25 | 1 | -1/+2 |
* | | | | | | | | | | Merge branch 'ks/doc-use-camelcase-for-config-name' | Junio C Hamano | 2017-09-28 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | doc: camelCase the config variables to improve readabilityks/doc-use-camelcase-for-config-name | Kaartic Sivaraam | 2017-09-25 | 2 | -3/+3 |
* | | | | | | | | | | | Merge branch 'jk/doc-read-tree-table-asciidoctor-fix' | Junio C Hamano | 2017-09-28 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | doc: put literal block delimiter around tablejk/doc-read-tree-table-asciidoctor-fix | Jeff King | 2017-09-24 | 1 | -0/+2 |
* | | | | | | | | | | | | Merge branch 'ic/fix-filter-branch-to-handle-tag-without-tagger' | Junio C Hamano | 2017-09-28 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | filter-branch: stash away ref map in a branch | Ian Campbell | 2017-09-22 | 1 | -1/+7 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Sync with 2.14.2 | Junio C Hamano | 2017-09-26 | 6 | -0/+95 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Git 2.14.2v2.14.2 | Junio C Hamano | 2017-09-22 | 1 | -0/+11 |
| * | | | | | | | | | | Sync with 2.13.6 | Junio C Hamano | 2017-09-22 | 5 | -0/+84 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Git 2.13.6v2.13.6maint-2.13 | Junio C Hamano | 2017-09-22 | 1 | -0/+17 |
| | * | | | | | | | | | Sync with 2.12.5 | Junio C Hamano | 2017-09-22 | 4 | -0/+67 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | Git 2.12.5v2.12.5maint-2.12 | Junio C Hamano | 2017-09-22 | 1 | -0/+17 |