summaryrefslogtreecommitdiffstats
path: root/t
AgeCommit message (Expand)AuthorLines
2015-07-24Revert "git-am: add am.threeWay config variable"Junio C Hamano-19/+0
2015-07-13Merge branch 'es/worktree-add'Junio C Hamano-27/+52
2015-07-13Merge branch 'nd/multiple-work-trees'Junio C Hamano-11/+19
2015-07-13Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'Junio C Hamano-0/+21
2015-07-10Merge branch 'jk/rev-list-no-bitmap-while-pruning'Junio C Hamano-0/+6
2015-07-10Merge branch 'rh/test-color-avoid-terminfo-in-original-home'Junio C Hamano-52/+47
2015-07-10Merge branch 'sb/p5310-and-chain'Junio C Hamano-3/+3
2015-07-10Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano-0/+26
2015-07-09Merge branch 'jk/maint-for-each-packed-object'Junio C Hamano-0/+1
2015-07-07worktree: add: auto-vivify new branch when <branch> is omittedEric Sunshine-0/+14
2015-07-06worktree: add: make -b/-B default to HEAD when <branch> is omittedEric Sunshine-0/+5
2015-07-06tests: worktree: retrofit "checkout --to" tests for "worktree add"Eric Sunshine-29/+25
2015-07-06checkout: fix bug with --to and relative HEADEric Sunshine-0/+10
2015-07-01rev-list: disable --use-bitmap-index when pruning commitsJeff King-0/+6
2015-07-01Add tests for wildcard "path vs ref" disambiguationNguyễn Thái Ngọc Duy-0/+26
2015-06-29rebase -i: do not leave a CHERRY_PICK_HEAD file behindJohannes Schindelin-1/+1
2015-06-29t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin-0/+21
2015-06-29worktree: new place for "git prune --worktrees"Nguyễn Thái Ngọc Duy-11/+11
2015-06-26p5310: Fix broken && chain in performance testStefan Beller-3/+3
2015-06-25Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano-7/+0
2015-06-25Merge branch 'jk/die-on-bogus-worktree-late' into maintJunio C Hamano-8/+16
2015-06-25Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maintJunio C Hamano-0/+15
2015-06-25Merge branch 'mm/rebase-i-post-rewrite-exec' into maintJunio C Hamano-36/+53
2015-06-25Merge branch 'nd/diff-i-t-a'Junio C Hamano-25/+8
2015-06-24Merge branch 'jk/stash-require-clean-index'Junio C Hamano-7/+0
2015-06-24Merge branch 'pt/t0302-needs-sanity'Junio C Hamano-1/+1
2015-06-24Merge branch 'ld/p4-changes-block-size'Junio C Hamano-9/+102
2015-06-24Merge branch 'sg/commit-cleanup-scissors'Junio C Hamano-1/+23
2015-06-24Merge branch 'mh/reporting-broken-refs-from-for-each-ref'Junio C Hamano-0/+56
2015-06-24Merge branch 'pt/am-abort-fix'Junio C Hamano-0/+81
2015-06-24Merge branch 'rl/am-3way-config'Junio C Hamano-15/+30
2015-06-24Merge branch 'jc/ll-merge-expose-path'Junio C Hamano-5/+9
2015-06-24Merge branch 'pt/pull-optparse'Junio C Hamano-0/+34
2015-06-24Merge branch 'qn/blame-show-email'Junio C Hamano-0/+62
2015-06-24Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'Junio C Hamano-0/+8
2015-06-24Merge branch 'es/send-email-sendmail-alias'Junio C Hamano-18/+63
2015-06-24Merge branch 'jc/apply-reject-noop-hunk'Junio C Hamano-0/+13
2015-06-23Revert "diff-lib.c: adjust position of i-t-a entries in diff"Junio C Hamano-25/+8
2015-06-22for_each_packed_object: automatically open pack indexJeff King-0/+1
2015-06-17test-lib.sh: fix color support when tput needs ~/.terminfoRichard Hansen-29/+28
2015-06-17Revert "test-lib.sh: do tests for color support after changing HOME"Richard Hansen-47/+43
2015-06-16Merge branch 'jk/http-backend-deadlock' into maintJunio C Hamano-13/+36
2015-06-16Merge branch 'jh/filter-empty-contents' into maintJunio C Hamano-0/+26
2015-06-16Merge branch 'jk/stash-options' into maintJunio C Hamano-0/+4
2015-06-16Merge branch 'jk/die-on-bogus-worktree-late'Junio C Hamano-8/+16
2015-06-16Merge branch 'ah/send-email-sendmail-alias'Junio C Hamano-1/+28
2015-06-15Revert "stash: require a clean index to apply"Jeff King-7/+0
2015-06-12checkout: don't check worktrees when not necessaryNguyễn Thái Ngọc Duy-0/+8
2015-06-12t0302: "unreadable" test needs SANITY prereqPaul Tan-1/+1
2015-06-11Merge branch 'jk/squelch-missing-link-warning-for-unreachable'Junio C Hamano-0/+15