summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/pull-signed-tag'Junio C Hamano2012-01-311-1/+2
|\
| * merge: use editor by default in interactive sessionsJunio C Hamano2012-01-231-1/+2
* | Merge branch 'nd/clone-detached'Junio C Hamano2012-01-313-17/+53
|\ \
| * | clone: allow --branch to take a tagNguyễn Thái Ngọc Duy2012-01-162-0/+24
| * | clone: refuse to clone if --branch points to bogus refNguyễn Thái Ngọc Duy2012-01-162-13/+2
| * | clone: write detached HEAD in bare repositoriesNguyễn Thái Ngọc Duy2012-01-161-1/+24
| * | t5601: add missing && cascadeNguyễn Thái Ngọc Duy2012-01-161-3/+3
* | | Merge branch 'da/maint-mergetool-twoway'Junio C Hamano2012-01-311-1/+27
|\ \ \
| * | | mergetool: Provide an empty file when neededda/maint-mergetool-twowayDavid Aguilar2012-01-231-1/+27
* | | | Merge branch 'va/git-p4-branch'Junio C Hamano2012-01-311-7/+87
|\ \ \ \
| * | | | t9801: do not overuse test_must_failva/git-p4-branchJunio C Hamano2012-01-261-4/+4
| * | | | git-p4: Add test case for complex branch importVitor Antunes2012-01-261-7/+87
* | | | | Merge branch 'jl/submodule-re-add'Junio C Hamano2012-01-311-0/+8
|\ \ \ \ \
| * | | | | submodule add: fix breakage when re-adding a deep submodulejl/submodule-re-addJens Lehmann2012-01-241-0/+8
* | | | | | Merge branch 'tr/grep-l-with-decoration'Junio C Hamano2012-01-311-0/+22
|\ \ \ \ \ \
| * | | | | | grep: fix -l/-L interaction with decoration linestr/grep-l-with-decorationAlbert Yale2012-01-231-0/+22
* | | | | | | Merge branch 'ks/sort-wildcard-in-makefile'Junio C Hamano2012-01-311-3/+3
|\ \ \ \ \ \ \
| * | | | | | | t/Makefile: Use $(sort ...) explicitly where neededks/sort-wildcard-in-makefileKirill Smelkov2012-01-221-3/+3
* | | | | | | | Merge branch 'ld/git-p4-branches-and-labels'Junio C Hamano2012-01-312-0/+161
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | git-p4: label import fails with multiple labels at the same changelistld/git-p4-branches-and-labelsLuke Diamand2012-01-201-0/+41
| * | | | | | | git-p4: add test for p4 labelsLuke Diamand2012-01-201-0/+72
| * | | | | | | git-p4: handle p4 branches and labels containing shell charsLuke Diamand2012-01-201-0/+48
* | | | | | | | Merge branch 'rs/diff-postimage-in-context'Junio C Hamano2012-01-291-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | xdiff: print post-image for common records instead of pre-imagers/diff-postimage-in-contextRené Scharfe2012-01-061-7/+7
* | | | | | | | | Merge branch 'sp/smart-http-failure-to-push'Junio C Hamano2012-01-291-0/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remote-curl: Fix push status report when all branches failShawn O. Pearce2012-01-201-0/+28
* | | | | | | | | | Merge branch 'jc/maint-log-first-parent-pathspec'Junio C Hamano2012-01-291-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Making pathspec limited log play nicer with --first-parentjc/maint-log-first-parent-pathspecJunio C Hamano2012-01-191-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jl/test-pause'Junio C Hamano2012-01-292-0/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test-lib: add the test_pause convenience functionjl/test-pauseJens Lehmann2012-01-172-0/+26
* | | | | | | | | | | Merge branch 'tr/maint-mailinfo'Junio C Hamano2012-01-291-2/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mailinfo: with -b, keep space after [foo]tr/maint-mailinfoThomas Rast2012-01-161-1/+1
| * | | | | | | | | | | am: learn passing -b to mailinfoThomas Rast2012-01-161-2/+12
* | | | | | | | | | | | Merge branch 'pw/p4-view-updates'Junio C Hamano2012-01-292-3/+396
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-p4: add tests demonstrating spec overlay ambiguitiespw/p4-view-updatesPete Wyckoff2012-01-111-0/+387
| * | | | | | | | | | | | git-p4: adjust test to adhere to stricter useClientSpecPete Wyckoff2012-01-111-2/+2
| * | | | | | | | | | | | git-p4: only a single ... wildcard is supportedPete Wyckoff2012-01-111-1/+7
* | | | | | | | | | | | | Merge branch 'jn/gitweb-unspecified-action'Junio C Hamano2012-01-291-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | gitweb: Fix actionless dispatch for non-existent objectsjn/gitweb-unspecified-actionJakub Narebski2012-01-091-0/+8
* | | | | | | | | | | | | | Merge branch 'cb/push-quiet'Junio C Hamano2012-01-292-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t5541: avoid TAP test miscountingcb/push-quietMichael J Gruber2012-01-081-1/+1
| * | | | | | | | | | | | | | fix push --quiet: add 'quiet' capability to receive-packClemens Buchacher2012-01-082-0/+15
* | | | | | | | | | | | | | | Merge branch 'nd/clone-single-branch'Junio C Hamano2012-01-291-1/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | clone: add --single-branch to fetch only one branchnd/clone-single-branchNguyễn Thái Ngọc Duy2012-01-081-1/+71
* | | | | | | | | | | | | | | Merge branch 'cb/git-daemon-tests'Junio C Hamano2012-01-292-0/+217
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-daemon tests: wait until daemon is readycb/git-daemon-testsClemens Buchacher2012-01-081-1/+17
| * | | | | | | | | | | | | | | git-daemon: add testsClemens Buchacher2012-01-082-0/+201
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'nd/pathspec-recursion-cleanup'Junio C Hamano2012-01-181-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | diff-index: enable recursive pathspec matching in unpack_treesnd/pathspec-recursion-cleanupNguyen Thai Ngoc Duy2012-01-161-0/+8
* | | | | | | | | | | | | | | | Merge branch 'tr/maint-word-diff-incomplete-line'Junio C Hamano2012-01-181-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |