Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t6036: add a failed conflict detection case with symlink modify/modify | Elijah Newren | 2018-07-03 | 1 | -0/+67 |
* | Merge branch 'sb/fix-fetching-moved-submodules' | Junio C Hamano | 2018-06-28 | 1 | -5/+1 |
|\ | |||||
| * | t5526: test recursive submodules when fetching moved submodules | Stefan Beller | 2018-06-14 | 1 | -5/+1 |
* | | Merge branch 'jc/clean-after-sanity-tests' | Junio C Hamano | 2018-06-28 | 5 | -9/+6 |
|\ \ | |||||
| * | | tests: clean after SANITY tests | Junio C Hamano | 2018-06-15 | 5 | -9/+6 |
* | | | Merge branch 'nd/completion-negation' | Junio C Hamano | 2018-06-28 | 1 | -2/+39 |
|\ \ \ | |||||
| * | | | completion: collapse extra --no-.. options | Nguyễn Thái Ngọc Duy | 2018-06-11 | 1 | -11/+38 |
| * | | | completion: suppress some -no- options | Nguyễn Thái Ngọc Duy | 2018-05-29 | 1 | -2/+0 |
| * | | | parse-options: option to let --git-completion-helper show negative form | Nguyễn Thái Ngọc Duy | 2018-05-29 | 1 | -2/+14 |
* | | | | Merge branch 'pw/add-p-recount' | Junio C Hamano | 2018-06-28 | 1 | -0/+43 |
|\ \ \ \ | |||||
| * | | | | add -p: fix counting empty context lines in edited patches | Phillip Wood | 2018-06-11 | 1 | -0/+43 |
* | | | | | Merge branch 'jk/fetch-all-peeled-fix' | Junio C Hamano | 2018-06-28 | 1 | -0/+41 |
|\ \ \ \ \ | |||||
| * | | | | | fetch-pack: test explicitly that --all can fetch tag references pointing to n... | Kirill Smelkov | 2018-06-13 | 1 | -0/+31 |
| * | | | | | fetch-pack: don't try to fetch peel values with --all | Jeff King | 2018-06-11 | 1 | -0/+10 |
* | | | | | | Merge branch 'jh/partial-clone' | Junio C Hamano | 2018-06-28 | 1 | -0/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | list-objects: check if filter is NULL before using | Jonathan Tan | 2018-06-12 | 1 | -0/+8 |
* | | | | | | | Merge branch 'sg/gpg-tests-fix' | Junio C Hamano | 2018-06-28 | 4 | -7/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tests: make forging GPG signed commits and tags more robust | SZEDER Gábor | 2018-06-11 | 4 | -5/+4 |
| * | | | | | | | t7510-signed-commit: use 'test_must_fail' | SZEDER Gábor | 2018-06-11 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'as/safecrlf-quiet-fix' | Junio C Hamano | 2018-06-28 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config.c: fix regression for core.safecrlf false | Anthony Sottile | 2018-06-11 | 1 | -0/+10 |
* | | | | | | | | | Merge branch 'cc/tests-without-assuming-ref-files-backend' | Junio C Hamano | 2018-06-25 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t9104: kosherly remove remote refs | Christian Couder | 2018-06-04 | 1 | -1/+3 |
* | | | | | | | | | | Merge branch 'nd/reject-empty-shallow-request' | Junio C Hamano | 2018-06-25 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | upload-pack: reject shallow requests that would return nothing | Nguyễn Thái Ngọc Duy | 2018-06-04 | 1 | -0/+11 |
* | | | | | | | | | | | Merge branch 'nd/complete-config-vars' | Junio C Hamano | 2018-06-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | am: move advice.amWorkDir parsing back to advice.c | Nguyễn Thái Ngọc Duy | 2018-05-29 | 1 | -1/+1 |
| * | | | | | | | | | | | Merge branch 'nd/command-list' into nd/complete-config-vars | Junio C Hamano | 2018-05-29 | 2 | -21/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'en/merge-recursive-tests' | Junio C Hamano | 2018-06-25 | 2 | -861/+1098 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t6036: prefer test_when_finished to manual cleanup in following test | Elijah Newren | 2018-05-28 | 1 | -10/+12 |
| * | | | | | | | | | | | | t6036, t6042: prefer test_cmp to sequences of test | Elijah Newren | 2018-05-28 | 2 | -73/+130 |
| * | | | | | | | | | | | | t6036, t6042: prefer test_path_is_file, test_path_is_missing | Elijah Newren | 2018-05-28 | 2 | -22/+22 |
| * | | | | | | | | | | | | t6036, t6042: use test_line_count instead of wc -l | Elijah Newren | 2018-05-28 | 2 | -67/+134 |
| * | | | | | | | | | | | | t6036, t6042: use test_create_repo to keep tests independent | Elijah Newren | 2018-05-28 | 2 | -815/+926 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'nd/diff-apply-ita' | Junio C Hamano | 2018-06-25 | 2 | -10/+64 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | apply: add --intent-to-add | Nguyễn Thái Ngọc Duy | 2018-05-29 | 1 | -0/+13 |
| * | | | | | | | | | | | | t2203: add a test about "diff HEAD" case | Nguyễn Thái Ngọc Duy | 2018-05-29 | 1 | -0/+17 |
| * | | | | | | | | | | | | diff: turn --ita-invisible-in-index on by default | Nguyễn Thái Ngọc Duy | 2018-05-29 | 2 | -10/+34 |
| * | | | | | | | | | | | | diff: ignore --ita-[in]visible-in-index when diffing worktree-to-tree | Nguyễn Thái Ngọc Duy | 2018-05-29 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'ds/commit-graph-lockfile-fix' | Junio C Hamano | 2018-06-25 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | merge: check config before loading commits | Derrick Stolee | 2018-05-22 | 1 | -0/+9 |
* | | | | | | | | | | | | | | Merge branch 'pc/submodule-helper-foreach' | Junio C Hamano | 2018-06-25 | 1 | -3/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | submodule foreach: document variable '$displaypath' | Prathamesh Chavan | 2018-05-09 | 1 | -11/+11 |
| * | | | | | | | | | | | | | | submodule foreach: correct '$path' in nested submodules from a subdirectory | Prathamesh Chavan | 2018-05-09 | 1 | -2/+34 |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'cf/submodule-progress-dissociate' | Junio C Hamano | 2018-06-19 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t7400: encapsulate setup code in test_expect_success | Stefan Beller | 2018-06-19 | 1 | -2/+4 |
* | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-root-fix' | Junio C Hamano | 2018-06-19 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | t3404: check root commit in 'rebase -i --root reword root commit' | Todd Zullinger | 2018-06-19 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | Merge branch 'sg/t7406-chain-fix' | Junio C Hamano | 2018-06-18 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | t7406-submodule-update: fix broken &&-chains | SZEDER Gábor | 2018-06-18 | 1 | -6/+6 |
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |