summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ef/maint-rebase-error-message'Junio C Hamano2012-06-011-0/+5
|\
| * rebase: report invalid commit correctlyErik Faye-Lund2012-05-301-0/+5
* | Merge branch 'nh/empty-rebase'Junio C Hamano2012-06-011-0/+30
|\ \
| * | cherry-pick: regression fix for empty commitsJunio C Hamano2012-05-291-0/+30
* | | t5701: modernize styleJeff King2012-05-291-53/+20
* | | Merge branch 'va/git-p4-test'Junio C Hamano2012-05-291-3/+107
|\ \ \
| * | | git-p4: Clean up branch test casesVitor Antunes2012-05-291-3/+1
| * | | git-p4: Verify detection of "empty" branch creationVitor Antunes2012-05-291-0/+54
| * | | git-p4: Test changelists touching two branchesVitor Antunes2012-05-291-0/+52
* | | | Merge branch 'mh/test-keep-prove-cache'Junio C Hamano2012-05-251-2/+4
|\ \ \ \
| * | | | t/Makefile: retain cache t/.prove across prove runsMichael Haggerty2012-05-201-2/+4
* | | | | Merge branch 'fc/git-complete-helper-fix'Junio C Hamano2012-05-251-1/+1
|\ \ \ \ \
| * | | | | completion: rename internal helpers _git and _gitkFelipe Contreras2012-05-201-1/+1
* | | | | | Merge branch 'jk/ident-split-fix'Junio C Hamano2012-05-251-0/+7
|\ \ \ \ \ \
| * | | | | | fix off-by-one error in split_ident_lineJeff King2012-05-221-0/+7
* | | | | | | Merge branch 'rs/maint-grep-F'Junio C Hamano2012-05-251-0/+5
|\ \ \ \ \ \ \
| * | | | | | | grep: support newline separated pattern listRené Scharfe2012-05-201-0/+5
* | | | | | | | Merge branch 'js/rebase-i-p-test-fix'Junio C Hamano2012-05-231-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix t3411.3 to actually rebase somethingJohannes Sixt2012-05-181-0/+1
* | | | | | | | | Merge branch 'bp/diff-no-index-strbuf-fix'Junio C Hamano2012-05-231-0/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff --no-index: reset temporary buffer lengths on directory iterationBobby Powers2012-05-161-0/+19
* | | | | | | | | | Merge branch 'hv/submodule-alt-odb'Junio C Hamano2012-05-231-0/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | teach add_submodule_odb() to look for alternatesHeiko Voigt2012-05-141-0/+34
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-05-203-3/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Consistently use "superproject" instead of "supermodule"Jens Lehmann2012-05-202-3/+3
| * | | | | | | | | | t3404: begin "exchange commits with -p" test with correct preconditionsJohannes Sixt2012-05-201-0/+1
| * | | | | | | | | | Merge branch 'jk/maint-reflog-walk-count-vs-time' into maintJunio C Hamano2012-05-141-4/+57
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ef/checkout-empty' into maintJunio C Hamano2012-05-141-0/+11
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-tformat-with-z' into maintJunio C Hamano2012-05-141-0/+28
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/checkout-detach-count' into maintJunio C Hamano2012-05-141-5/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ct/advise-push-default' into maintJunio C Hamano2012-05-112-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/fast-import-test-9300' into maintJunio C Hamano2012-05-111-34/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maintJunio C Hamano2012-05-111-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sl/test-wc-l-line-count' into maintJunio C Hamano2012-05-1119-74/+65
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rl/show-empty-prefix' into maintJunio C Hamano2012-05-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/include-userpath' into maintJunio C Hamano2012-05-101-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/test-fix-grep-gnuism' into maintJunio C Hamano2012-05-101-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/http-backend-keep-committer-ident-env' into maintJunio C Hamano2012-05-102-0/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-push-progress' into maintJunio C Hamano2012-05-101-2/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lp/diffstat-with-graph' into maintJunio C Hamano2012-05-102-4/+121
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-gitweb-test-use-sane-perl' into maintJunio C Hamano2012-05-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/daemon-test-race-fix' into maintJunio C Hamano2012-05-071-11/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-config-bogus-section' into maintJunio C Hamano2012-05-071-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/t5800-import-race-fix' into maintJunio C Hamano2012-05-071-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fc/git-complete-helper'Junio C Hamano2012-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | completion: add new __git_complete helperFelipe Contreras2012-05-141-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ld/git-p4-tags-and-labels'Junio C Hamano2012-05-171-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | git p4: add test for tag import/export enabled via configLuke Diamand2012-05-111-0/+20
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/threaded-index-pack'Junio C Hamano2012-05-141-0/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | index-pack: support multithreaded delta resolvingNguyễn Thái Ngọc Duy2012-05-071-0/+40