Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with 2.12.2 | Junio C Hamano | 2017-03-24 | 2 | -1/+24 |
|\ | |||||
| * | Git 2.12.2v2.12.2 | Junio C Hamano | 2017-03-24 | 2 | -1/+24 |
| * | Merge branch 'ab/doc-no-option-notation-fix' into maint | Junio C Hamano | 2017-03-24 | 2 | -2/+2 |
| |\ | |||||
| * \ | Merge branch 'ab/push-default-doc-fix' into maint | Junio C Hamano | 2017-03-24 | 1 | -0/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'nd/commit-hook-doc-fix' into maint | Junio C Hamano | 2017-03-24 | 1 | -1/+1 |
| |\ \ \ | |||||
* | | | | | Seventh batch for 2.13 | Junio C Hamano | 2017-03-24 | 1 | -9/+29 |
* | | | | | Merge branch 'dl/credential-cache-socket-in-xdg-cache' | Junio C Hamano | 2017-03-24 | 1 | -4/+7 |
|\ \ \ \ \ | |||||
| * | | | | | credential-cache: use XDG_CACHE_HOME for socket | Devin Lehmacher | 2017-03-17 | 1 | -4/+7 |
* | | | | | | Sync with maint | Junio C Hamano | 2017-03-21 | 1 | -0/+61 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Prepare for 2.12.2 | Junio C Hamano | 2017-03-21 | 1 | -0/+61 |
| * | | | | | Merge branch 'dt/gc-ignore-old-gc-logs' into maint | Junio C Hamano | 2017-03-21 | 1 | -0/+6 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ps/docs-diffcore' into maint | Junio C Hamano | 2017-03-21 | 1 | -5/+5 |
| |\ \ \ \ \ \ | |||||
* | | | | | | | | Sixth batch for 2.13 | Junio C Hamano | 2017-03-21 | 1 | -17/+23 |
* | | | | | | | | Merge branch 'nd/commit-hook-doc-fix' | Junio C Hamano | 2017-03-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | git-commit.txt: list post-rewrite in HOOKS sectionnd/commit-hook-doc-fix | Nguyễn Thái Ngọc Duy | 2017-03-20 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'ab/push-default-doc-fix' | Junio C Hamano | 2017-03-21 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | push: mention "push.default=tracking" in the documentationab/push-default-doc-fix | Ævar Arnfjörð Bjarmason | 2017-03-20 | 1 | -0/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'ab/doc-no-option-notation-fix' | Junio C Hamano | 2017-03-21 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | doc: change erroneous --[no]-whatever into --[no-]whateverab/doc-no-option-notation-fix | Ævar Arnfjörð Bjarmason | 2017-03-20 | 2 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'nd/conditional-config-include' | Junio C Hamano | 2017-03-21 | 1 | -7/+69 |
|\ \ \ \ \ \ | |||||
| * | | | | | | config: add conditional include | Nguyễn Thái Ngọc Duy | 2017-03-11 | 1 | -0/+63 |
| * | | | | | | config.txt: reflow the second include.path paragraph | Nguyễn Thái Ngọc Duy | 2017-03-11 | 1 | -5/+4 |
| * | | | | | | config.txt: clarify multiple key values in include.path | Nguyễn Thái Ngọc Duy | 2017-03-11 | 1 | -2/+2 |
* | | | | | | | Sync with 2.12.1 | Junio C Hamano | 2017-03-20 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Git 2.12.1v2.12.1 | Junio C Hamano | 2017-03-20 | 1 | -1/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Fifth batch for 2.13 | Junio C Hamano | 2017-03-17 | 1 | -9/+54 |
* | | | | | | Merge branch 'bw/attr-pathspec' | Junio C Hamano | 2017-03-17 | 1 | -0/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pathspec: allow querying for attributes | Brandon Williams | 2017-03-13 | 1 | -0/+21 |
* | | | | | | | Merge branch 'sb/rev-parse-show-superproject-root' | Junio C Hamano | 2017-03-17 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rev-parse: add --show-superproject-working-tree | Stefan Beller | 2017-03-08 | 1 | -0/+6 |
* | | | | | | | | Merge branch 'cc/split-index-config' | Junio C Hamano | 2017-03-17 | 2 | -8/+64 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation/git-update-index: explain splitIndex.* | Christian Couder | 2017-03-06 | 2 | -9/+30 |
| * | | | | | | | | Documentation/config: add splitIndex.sharedIndexExpire | Christian Couder | 2017-03-06 | 1 | -0/+12 |
| * | | | | | | | | Documentation/config: add splitIndex.maxPercentChange | Christian Couder | 2017-03-01 | 1 | -0/+13 |
| * | | | | | | | | Documentation/git-update-index: talk about core.splitIndex config var | Christian Couder | 2017-03-01 | 1 | -0/+6 |
| * | | | | | | | | Documentation/config: add information for core.splitIndex | Christian Couder | 2017-03-01 | 1 | -0/+4 |
* | | | | | | | | | Sync with 'maint' | Junio C Hamano | 2017-03-16 | 1 | -0/+41 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Preparing for 2.12.1 | Junio C Hamano | 2017-03-16 | 1 | -0/+41 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Fourth batch after 2.12 | Junio C Hamano | 2017-03-14 | 1 | -0/+42 |
* | | | | | | | | Merge branch 'dp/filter-branch-prune-empty' | Junio C Hamano | 2017-03-14 | 1 | -8/+6 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | filter-branch: fix --prune-empty on parentless commits | Devin J. Pohly | 2017-03-03 | 1 | -8/+6 |
* | | | | | | | | Third batch after 2.12 | Junio C Hamano | 2017-03-12 | 1 | -0/+39 |
* | | | | | | | | Merge branch 'ah/doc-ls-files-quotepath' | Junio C Hamano | 2017-03-12 | 9 | -39/+48 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Documentation: improve description for core.quotePathah/doc-ls-files-quotepath | Andreas Heiduk | 2017-03-02 | 9 | -39/+48 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Second batch after 2.12 | Junio C Hamano | 2017-03-10 | 1 | -0/+65 |
* | | | | | | | Merge branch 'tg/stash-push' | Junio C Hamano | 2017-03-10 | 1 | -6/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | stash: allow pathspecs in the no verb formtg/stash-push | Thomas Gummerer | 2017-02-28 | 1 | -4/+7 |
| * | | | | | | | stash: use stash_push for no verb form | Thomas Gummerer | 2017-02-28 | 1 | -4/+4 |
| * | | | | | | | stash: teach 'push' (and 'create_stash') to honor pathspec | Thomas Gummerer | 2017-02-28 | 1 | -1/+8 |
| * | | | | | | | stash: introduce push verb | Thomas Gummerer | 2017-02-19 | 1 | -0/+3 |