summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Revert "git-am: add am.threeWay config variable"Junio C Hamano2015-07-241-19/+0
* Merge branch 'es/worktree-add'Junio C Hamano2015-07-133-27/+52
|\
| * worktree: add: auto-vivify new branch when <branch> is omittedEric Sunshine2015-07-071-0/+14
| * worktree: add: make -b/-B default to HEAD when <branch> is omittedEric Sunshine2015-07-061-0/+5
| * tests: worktree: retrofit "checkout --to" tests for "worktree add"Eric Sunshine2015-07-063-29/+25
| * checkout: fix bug with --to and relative HEADEric Sunshine2015-07-061-0/+10
* | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-07-132-11/+19
|\ \ | |/
| * worktree: new place for "git prune --worktrees"nd/multiple-work-treesNguyễn Thái Ngọc Duy2015-06-291-11/+11
| * checkout: don't check worktrees when not necessaryNguyễn Thái Ngọc Duy2015-06-121-0/+8
* | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'Junio C Hamano2015-07-131-0/+21
|\ \
| * | rebase -i: do not leave a CHERRY_PICK_HEAD file behindjs/rebase-i-clean-up-upon-continue-to-skipJohannes Schindelin2015-06-291-1/+1
| * | t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin2015-06-291-0/+21
* | | Merge branch 'jk/rev-list-no-bitmap-while-pruning'Junio C Hamano2015-07-101-0/+6
|\ \ \
| * | | rev-list: disable --use-bitmap-index when pruning commitsjk/rev-list-no-bitmap-while-pruningJeff King2015-07-011-0/+6
* | | | Merge branch 'rh/test-color-avoid-terminfo-in-original-home'Junio C Hamano2015-07-101-52/+47
|\ \ \ \
| * | | | test-lib.sh: fix color support when tput needs ~/.terminforh/test-color-avoid-terminfo-in-original-homeRichard Hansen2015-06-171-29/+28
| * | | | Revert "test-lib.sh: do tests for color support after changing HOME"Richard Hansen2015-06-171-47/+43
* | | | | Merge branch 'sb/p5310-and-chain'Junio C Hamano2015-07-101-3/+3
|\ \ \ \ \
| * | | | | p5310: Fix broken && chain in performance testsb/p5310-and-chainStefan Beller2015-06-261-3/+3
| * | | | | Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-06-251-7/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/die-on-bogus-worktree-late' into maintJunio C Hamano2015-06-251-8/+16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maintJunio C Hamano2015-06-251-0/+15
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano2015-06-251-36/+53
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano2015-06-161-13/+36
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jh/filter-empty-contents' into maintJunio C Hamano2015-06-161-0/+26
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/stash-options' into maintJunio C Hamano2015-06-161-0/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/skip-http-tests-under-no-curl' into maintJunio C Hamano2015-06-057-35/+12
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/pull-log-n' into maintJunio C Hamano2015-06-051-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-051-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/write-refs-sooner-2.4' into maintJunio C Hamano2015-06-052-2/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/ref-directory-file' into maintJunio C Hamano2015-06-052-7/+114
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/log-decorate-HEAD' into maintJunio C Hamano2015-06-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/t1020-cleanup' into maintJunio C Hamano2015-06-051-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/gitignore-precedence' into maintJunio C Hamano2015-06-051-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/connect-plink' into maintJunio C Hamano2015-06-051-1/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano2015-06-051-0/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2015-06-051-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2015-06-051-3/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-051-0/+114
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/hash-object' into maintJunio C Hamano2015-05-261-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-05-261-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-05-261-7/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/t1509-chroot-test' into maintJunio C Hamano2015-05-131-9/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/type-from-string-gently' into maintJunio C Hamano2015-05-131-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ep/fix-test-lib-functions-report' into maintJunio C Hamano2015-05-131-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cn/bom-in-gitignore' into maintJunio C Hamano2015-05-131-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano2015-07-101-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for wildcard "path vs ref" disambiguationNguyễn Thái Ngọc Duy2015-07-011-0/+26
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-for-each-packed-object'Junio C Hamano2015-07-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for_each_packed_object: automatically open pack indexjk/maint-for-each-packed-objectJeff King2015-06-221-0/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
View Lorry Controller Status