Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | t7406: avoid failures solely due to timing issues | Johannes Schindelin | 2018-07-23 | 1 | -5/+6 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'bw/fetch-pack-i18n' | Junio C Hamano | 2018-08-16 | 1 | -8/+8 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fetch-pack: mark die strings for translation | Brandon Williams | 2018-07-24 | 1 | -8/+8 | |
* | | | | | | | | | | Merge branch 'sg/fast-import-dump-refs-on-checkpoint-fix' | Junio C Hamano | 2018-08-16 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | t9300: wait for background fast-import process to die after killing it | SZEDER Gábor | 2018-07-20 | 1 | -1/+4 | |
* | | | | | | | | | | | Merge branch 'sb/trailers-docfix' | Junio C Hamano | 2018-08-16 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Documentation/git-interpret-trailers: explain possible values | Stefan Beller | 2018-07-21 | 1 | -3/+6 | |
* | | | | | | | | | | | | Merge branch 'jk/ui-color-always-to-auto' | Junio C Hamano | 2018-08-16 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Documentation: fix --color option formatting | Andrei Rybak | 2018-07-18 | 2 | -2/+2 | |
* | | | | | | | | | | | | | Fifth batch for 2.19 cycle | Junio C Hamano | 2018-08-03 | 1 | -0/+107 | |
* | | | | | | | | | | | | | Merge branch 'jt/commit-graph-per-object-store' | Junio C Hamano | 2018-08-03 | 16 | -62/+207 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | commit-graph: add repo arg to graph readers | Jonathan Tan | 2018-07-18 | 13 | -42/+162 | |
| * | | | | | | | | | | | | | commit-graph: store graph in struct object_store | Jonathan Tan | 2018-07-18 | 3 | -21/+27 | |
| * | | | | | | | | | | | | | commit-graph: add free_commit_graph | Jonathan Tan | 2018-07-18 | 3 | -10/+18 | |
| * | | | | | | | | | | | | | commit-graph: add missing forward declaration | Jonathan Tan | 2018-07-18 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | object-store: add missing include | Jonathan Tan | 2018-07-18 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | commit-graph: refactor preparing commit graph | Jonathan Tan | 2018-07-18 | 1 | -11/+17 | |
| * | | | | | | | | | | | | | Merge branch 'ds/commit-graph-fsck' into jt/commit-graph-per-object-store | Junio C Hamano | 2018-07-18 | 14 | -83/+575 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'es/chain-lint-in-subshell' | Junio C Hamano | 2018-08-03 | 78 | -5/+1316 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | t/chainlint.sed: drop extra spaces from regex character class | Eric Sunshine | 2018-07-31 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | t/chainlint: add chainlint "specialized" test cases | Eric Sunshine | 2018-07-17 | 4 | -0/+31 | |
| * | | | | | | | | | | | | | | | t/chainlint: add chainlint "complex" test cases | Eric Sunshine | 2018-07-17 | 8 | -0/+82 | |
| * | | | | | | | | | | | | | | | t/chainlint: add chainlint "cuddled" test cases | Eric Sunshine | 2018-07-17 | 6 | -0/+70 | |
| * | | | | | | | | | | | | | | | t/chainlint: add chainlint "loop" and "conditional" test cases | Eric Sunshine | 2018-07-17 | 10 | -0/+200 | |
| * | | | | | | | | | | | | | | | t/chainlint: add chainlint "nested subshell" test cases | Eric Sunshine | 2018-07-17 | 12 | -0/+173 | |
| * | | | | | | | | | | | | | | | t/chainlint: add chainlint "one-liner" test cases | Eric Sunshine | 2018-07-17 | 6 | -0/+71 | |
| * | | | | | | | | | | | | | | | t/chainlint: add chainlint "whitespace" test cases | Eric Sunshine | 2018-07-17 | 12 | -0/+113 | |
| * | | | | | | | | | | | | | | | t/chainlint: add chainlint "basic" test cases | Eric Sunshine | 2018-07-17 | 16 | -0/+206 | |
| * | | | | | | | | | | | | | | | t/Makefile: add machinery to check correctness of chainlint.sed | Eric Sunshine | 2018-07-17 | 2 | -4/+22 | |
| * | | | | | | | | | | | | | | | t/test-lib: teach --chain-lint to detect broken &&-chains in subshells | Eric Sunshine | 2018-07-17 | 2 | -1/+348 | |
* | | | | | | | | | | | | | | | | Merge branch 'jt/tags-to-promised-blobs-fix' | Junio C Hamano | 2018-08-03 | 3 | -3/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | tag: don't warn if target is missing but promised | Jonathan Tan | 2018-07-16 | 2 | -5/+17 | |
| * | | | | | | | | | | | | | | | | revision: tolerate promised targets of tags | Jonathan Tan | 2018-07-16 | 2 | -0/+42 | |
* | | | | | | | | | | | | | | | | | Merge branch 'jt/fetch-negotiator-skipping' | Junio C Hamano | 2018-08-03 | 8 | -4/+461 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | negotiator/skipping: skip commits during fetch | Jonathan Tan | 2018-07-16 | 8 | -4/+461 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jm/send-email-tls-auth-on-batch' | Junio C Hamano | 2018-08-03 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | send-email: fix tls AUTH when sending batch | Jules Maselbas | 2018-07-17 | 1 | -2/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'bc/sequencer-export-work-tree-as-well' | Junio C Hamano | 2018-08-03 | 2 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | sequencer: pass absolute GIT_WORK_TREE to exec commands | brian m. carlson | 2018-07-16 | 2 | -0/+11 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'en/t7405-recursive-submodule-conflicts' | Junio C Hamano | 2018-08-03 | 1 | -0/+173 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | t7405: verify 'merge --abort' works after submodule/path conflicts | Elijah Newren | 2018-07-11 | 1 | -0/+31 | |
| * | | | | | | | | | | | | | | | | | | t7405: add a directory/submodule conflict | Elijah Newren | 2018-07-11 | 1 | -0/+88 | |
| * | | | | | | | | | | | | | | | | | | t7405: add a file/submodule conflict | Elijah Newren | 2018-07-11 | 1 | -0/+54 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'en/t6036-merge-recursive-tests' | Junio C Hamano | 2018-08-03 | 1 | -0/+451 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | t6036: add a failed conflict detection case: regular files, different modes | Elijah Newren | 2018-07-11 | 1 | -0/+67 | |
| * | | | | | | | | | | | | | | | | | | t6036: add a failed conflict detection case with conflicting types | Elijah Newren | 2018-07-03 | 1 | -0/+75 | |
| * | | | | | | | | | | | | | | | | | | t6036: add a failed conflict detection case with submodule add/add | Elijah Newren | 2018-07-03 | 1 | -0/+88 | |
| * | | | | | | | | | | | | | | | | | | t6036: add a failed conflict detection case with submodule modify/modify | Elijah Newren | 2018-07-03 | 1 | -0/+88 | |
| * | | | | | | | | | | | | | | | | | | t6036: add a failed conflict detection case with symlink add/add | Elijah Newren | 2018-07-03 | 1 | -0/+66 | |
| * | | | | | | | | | | | | | | | | | | t6036: add a failed conflict detection case with symlink modify/modify | Elijah Newren | 2018-07-03 | 1 | -0/+67 | |
| |/ / / / / / / / / / / / / / / / / |