Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | pull, fetch: add --set-upstream option | Corentin BOMPARD | 2019-08-19 | 1 | -0/+178 |
* | Merge branch 'bc/hash-independent-tests-part-4' | Junio C Hamano | 2019-08-09 | 2 | -9/+8 |
|\ | |||||
| * | t0000: reword comments for "local" test | Jeff King | 2019-08-08 | 1 | -8/+6 |
| * | t: decrease nesting in test_oid_to_path | Jonathan Nieder | 2019-08-08 | 1 | -1/+2 |
* | | Merge branch 'mt/dir-iterator-updates' | Junio C Hamano | 2019-08-09 | 1 | -3/+1 |
|\ \ | |||||
| * | | test-dir-iterator: use path argument directly | René Scharfe | 2019-08-07 | 1 | -3/+1 |
* | | | Merge branch 'en/disable-dir-rename-in-recursive-merge' | Junio C Hamano | 2019-08-08 | 1 | -0/+111 |
|\ \ \ | |||||
| * | | | merge-recursive: avoid directory rename detection in recursive case | Elijah Newren | 2019-08-06 | 1 | -0/+111 |
| * | | | Merge branch 'fc/fetch-with-import-fix' into maint | Junio C Hamano | 2019-07-29 | 2 | -13/+27 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ds/close-object-store' into maint | Junio C Hamano | 2019-07-29 | 1 | -0/+8 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'pw/add-p-recount' into maint | Junio C Hamano | 2019-07-29 | 1 | -0/+8 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/trailers-use-config' into maint | Junio C Hamano | 2019-07-29 | 1 | -27/+44 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'tg/stash-ref-by-index-fix' into maint | Junio C Hamano | 2019-07-29 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'pw/rebase-abort-clean-rewritten' into maint | Junio C Hamano | 2019-07-29 | 1 | -1/+17 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'sg/rebase-progress' into maint | Junio C Hamano | 2019-07-29 | 3 | -75/+55 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ms/submodule-foreach-fix' into maint | Junio C Hamano | 2019-07-29 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maint | Junio C Hamano | 2019-07-29 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/denoise-rm-to-resolve' into maint | Junio C Hamano | 2019-07-29 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/mingw-spawn-with-spaces-in-path' into maint | Junio C Hamano | 2019-07-29 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/clean-report-too-long-a-path' into maint | Junio C Hamano | 2019-07-29 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'es/local-atomic-push-failure-with-http' into maint | Junio C Hamano | 2019-07-29 | 1 | -0/+49 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/t3404-typofix' into maint | Junio C Hamano | 2019-07-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/t0001-case-insensitive' into maint | Junio C Hamano | 2019-07-29 | 2 | -14/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/t5551-fetch-smart-error-is-translated' into maint | Junio C Hamano | 2019-07-29 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/t5551-test-chunked' into maint | Junio C Hamano | 2019-07-29 | 1 | -3/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sw/git-p4-unshelve-branched-files' into maint | Junio C Hamano | 2019-07-25 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/partial-clone-missing-ref-delta-base' into maint | Junio C Hamano | 2019-07-25 | 1 | -13/+99 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'xl/record-partial-clone-origin' into maint | Junio C Hamano | 2019-07-25 | 1 | -3/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pb/request-pull-verify-remote-ref' into maint | Junio C Hamano | 2019-07-25 | 1 | -0/+53 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'vv/merge-squash-with-explicit-commit' into maint | Junio C Hamano | 2019-07-25 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/bundle-verify-require-object-store' into maint | Junio C Hamano | 2019-07-25 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/am-i-resolved-fix' into maint | Junio C Hamano | 2019-07-25 | 1 | -0/+52 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/HEAD-symref-in-xfer-namespaces' into maint | Junio C Hamano | 2019-07-25 | 1 | -0/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/server-info-remove-crufts' into maint | Junio C Hamano | 2019-07-25 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/corrupt-worktrees' into maint | Junio C Hamano | 2019-07-25 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/init-relative-template-fix' into maint | Junio C Hamano | 2019-07-25 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit-graph: fix bug around octopus merges | Derrick Stolee | 2019-08-05 | 1 | -1/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/log-mailmap-flip-defaults' | Junio C Hamano | 2019-08-02 | 2 | -2/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log: really flip the --mailmap default | Junio C Hamano | 2019-08-02 | 1 | -0/+33 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log: flip the --mailmap default unconditionally | Junio C Hamano | 2019-08-01 | 1 | -2/+0 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/early-config-with-onbranch' | Junio C Hamano | 2019-08-02 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config: work around bug with includeif:onbranch and early config | Johannes Schindelin | 2019-08-01 | 1 | -0/+5 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/repack-silence-auto-bitmap-warning' | Junio C Hamano | 2019-08-01 | 1 | -1/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | repack: simplify handling of auto-bitmaps and .keep files | Jeff King | 2019-07-31 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | repack: silence warnings when auto-enabled bitmaps cannot be built | Jeff King | 2019-07-31 | 1 | -0/+11 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7700: clean up .keep file in bitmap-writing test | Jeff King | 2019-07-31 | 1 | -0/+1 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/sort-iter-test-output' | Junio C Hamano | 2019-08-01 | 2 | -33/+55 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t: sort output of hashmap iteration | Jeff King | 2019-07-31 | 2 | -33/+55 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/dir-iterator-test-fix' | Junio C Hamano | 2019-08-01 | 2 | -3/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-dir-iterator: do not assume errno values | Junio C Hamano | 2019-07-30 | 2 | -3/+12 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |