aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'es/worktree-add'Junio C Hamano2015-07-13
|\
| * worktree: add: auto-vivify new branch when <branch> is omittedEric Sunshine2015-07-07
| * worktree: add: make -b/-B default to HEAD when <branch> is omittedEric Sunshine2015-07-06
| * tests: worktree: retrofit "checkout --to" tests for "worktree add"Eric Sunshine2015-07-06
| * checkout: fix bug with --to and relative HEADEric Sunshine2015-07-06
* | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-07-13
|\ \ | |/
| * worktree: new place for "git prune --worktrees"Nguyễn Thái Ngọc Duy2015-06-29
| * checkout: don't check worktrees when not necessaryNguyễn Thái Ngọc Duy2015-06-12
* | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'Junio C Hamano2015-07-13
|\ \
| * | rebase -i: do not leave a CHERRY_PICK_HEAD file behindJohannes Schindelin2015-06-29
| * | t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin2015-06-29
* | | Merge branch 'jk/rev-list-no-bitmap-while-pruning'Junio C Hamano2015-07-10
|\ \ \
| * | | rev-list: disable --use-bitmap-index when pruning commitsJeff King2015-07-01
* | | | Merge branch 'rh/test-color-avoid-terminfo-in-original-home'Junio C Hamano2015-07-10
|\ \ \ \
| * | | | test-lib.sh: fix color support when tput needs ~/.terminfoRichard Hansen2015-06-17
| * | | | Revert "test-lib.sh: do tests for color support after changing HOME"Richard Hansen2015-06-17
* | | | | Merge branch 'sb/p5310-and-chain'Junio C Hamano2015-07-10
|\ \ \ \ \
| * | | | | p5310: Fix broken && chain in performance testStefan Beller2015-06-26
| * | | | | Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-06-25
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/die-on-bogus-worktree-late' into maintJunio C Hamano2015-06-25
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maintJunio C Hamano2015-06-25
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano2015-06-25
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jh/filter-empty-contents' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/stash-options' into maintJunio C Hamano2015-06-16
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/skip-http-tests-under-no-curl' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/pull-log-n' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/write-refs-sooner-2.4' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/ref-directory-file' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/log-decorate-HEAD' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/t1020-cleanup' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/gitignore-precedence' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/connect-plink' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/hash-object' into maintJunio C Hamano2015-05-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-05-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-05-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/t1509-chroot-test' into maintJunio C Hamano2015-05-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/type-from-string-gently' into maintJunio C Hamano2015-05-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ep/fix-test-lib-functions-report' into maintJunio C Hamano2015-05-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cn/bom-in-gitignore' into maintJunio C Hamano2015-05-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano2015-07-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for wildcard "path vs ref" disambiguationNguyễn Thái Ngọc Duy2015-07-01
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-for-each-packed-object'Junio C Hamano2015-07-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for_each_packed_object: automatically open pack indexJeff King2015-06-22
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync with 2.3.8Junio C Hamano2015-05-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |