Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ks/branch-set-upstream' | Junio C Hamano | 2018-06-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t3200: clarify description of --set-upstream test | Kaartic Sivaraam | 2018-06-18 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'js/rebase-i-root-fix' | Junio C Hamano | 2018-06-18 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | rebase --root: fix amending root commit messages | Johannes Schindelin | 2018-06-18 | 1 | -1/+1 |
| * | | | | | | | | rebase --root: demonstrate a bug while amending root commit messages | Todd Zullinger | 2018-06-18 | 1 | -0/+9 |
* | | | | | | | | | Merge branch 'jk/ewah-bounds-check' | Junio C Hamano | 2018-06-18 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | ewah_read_mmap: bounds-check mmap reads | Jeff King | 2018-06-18 | 1 | -0/+13 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Sync with Git 2.15.2 | Junio C Hamano | 2018-05-22 | 3 | -0/+182 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Sync with Git 2.14.4 | Junio C Hamano | 2018-05-22 | 3 | -0/+182 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Sync with Git 2.13.7 | Junio C Hamano | 2018-05-22 | 3 | -0/+182 |
| | | |\ \ \ \ \ \ \ \ | |||||
* | | | \ \ \ \ \ \ \ \ | Merge branch 'ld/git-p4-updates' | Junio C Hamano | 2018-06-18 | 3 | -0/+126 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-p4: auto-size the block | Luke Diamand | 2018-06-12 | 1 | -0/+8 |
| * | | | | | | | | | | | | git-p4: better error reporting when p4 fails | Luke Diamand | 2018-06-12 | 1 | -0/+78 |
| * | | | | | | | | | | | | git-p4: add options --commit and --disable-rebase | Romain Merland | 2018-06-12 | 1 | -0/+40 |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jk/index-pack-maint' | Junio C Hamano | 2018-06-13 | 2 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | index-pack: handle --strict checks of non-repo packs | Jeff King | 2018-06-01 | 1 | -0/+10 |
| * | | | | | | | | | | | | prepare_commit_graft: treat non-repository as a noop | Jeff King | 2018-06-01 | 1 | -0/+6 |
* | | | | | | | | | | | | | Merge branch 'jk/submodule-fsck-loose-fixup' | Junio C Hamano | 2018-06-13 | 1 | -7/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | fsck: avoid looking at NULL blob->object | Jeff King | 2018-06-11 | 1 | -0/+18 |
| * | | | | | | | | | | | | | t7415: don't bother creating commit for symlink test | Jeff King | 2018-06-11 | 1 | -7/+4 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'bc/t3430-fixup' | Junio C Hamano | 2018-06-04 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | t3430: test clean-up | brian m. carlson | 2018-06-04 | 1 | -3/+2 |
* | | | | | | | | | | | | | | Merge branch 'jt/submodule-pull-recurse-rebase' | Junio C Hamano | 2018-06-04 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |