summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2010-01-10Merge branch 'maint-1.6.1' into maint-1.6.2Libravatar Junio C Hamano2-20/+20
2010-01-10Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-13/+13
2010-01-09Handle relative paths in submodule .git filesLibravatar Brad King1-1/+1
2010-01-09Test update-index for a gitlink to a .git fileLibravatar Brad King1-0/+38
2010-01-09t7111: check that reset options work as described in the tablesLibravatar Christian Couder1-0/+113
2010-01-09transport-helper.c::push_refs(): ignore helper-reported status if ref is not ...Libravatar Tay Ray Chuan1-1/+1
2010-01-09transport.c::transport_push(): make ref status affect return valueLibravatar Tay Ray Chuan1-2/+2
2010-01-09refactor ref status logic for pushingLibravatar Tay Ray Chuan1-2/+2
2010-01-09t5541-http-push.sh: add test for unmatched, non-fast-forwarded refsLibravatar Tay Ray Chuan1-0/+21
2010-01-09t5541-http-push.sh: add tests for non-fast-forward pushesLibravatar Tay Ray Chuan1-0/+23
2010-01-09difftool: Allow specifying unconfigured commands with --extcmdLibravatar David Aguilar1-1/+18
2010-01-09difftool--helper: Remove use of the GIT_MERGE_TOOL variableLibravatar David Aguilar1-9/+0
2010-01-08ls-files: fix overeager pathspec optimizationLibravatar Junio C Hamano1-1/+1
2010-01-08t3001: test ls-files -o ignored/dirLibravatar Junio C Hamano1-0/+39
2010-01-07Merge branch 'sb/maint-octopus'Libravatar Junio C Hamano1-0/+51
2010-01-07Merge branch 'mv/commit-date'Libravatar Junio C Hamano1-0/+15
2010-01-07Merge branch 'mo/bin-wrappers'Libravatar Junio C Hamano2-12/+30
2010-01-07unpack-trees.c: look ahead in the indexLibravatar Junio C Hamano1-4/+4
2010-01-07rebase -i: teach --onto A...B syntaxLibravatar Nanako Shiraishi1-0/+30
2010-01-07rebase: fix --onto A...B parsing and add testsLibravatar Nanako Shiraishi1-0/+75
2010-01-06t7002: test for not using external grep on skip-worktree pathsLibravatar Nguyễn Thái Ngọc Duy1-0/+12
2010-01-06t7002: set test prerequisite "external-grep" if supportedLibravatar Nguyễn Thái Ngọc Duy1-0/+12
2010-01-06rebase -i --autosquash: auto-squash commitsLibravatar Nanako Shiraishi1-0/+73
2010-01-06checkout -m path: fix recreating conflictsLibravatar Junio C Hamano1-0/+57
2010-01-06Smart-http tests: Test http-backend without curl or a webserverLibravatar Tarmigan Casebolt2-6/+25
2010-01-06Smart-http tests: Break test t5560-http-backend into piecesLibravatar Tarmigan Casebolt3-147/+173
2010-01-06Smart-http tests: Improve coverage in test t5560Libravatar Tarmigan Casebolt1-11/+10
2010-01-06Smart-http: check if repository is OK to export before serving itLibravatar Tarmigan Casebolt2-2/+42
2010-01-06t/lib-http.sh: Restructure finding of default httpd locationLibravatar Tarmigan Casebolt1-6/+24
2010-01-05t4030, t4031: work around bogus MSYS bash path conversionLibravatar Johannes Sixt2-2/+2
2010-01-05textconv: use shell to run helperLibravatar Jeff King2-2/+2
2010-01-05t0021: use $SHELL_PATH for the filter scriptLibravatar Johannes Sixt1-1/+2
2010-01-03Aggressive three-way merge: fix D/F caseLibravatar Junio C Hamano1-1/+1
2010-01-03traverse_trees(): handle D/F conflict case sanelyLibravatar Junio C Hamano2-3/+3
2010-01-03more D/F conflict testsLibravatar Junio C Hamano1-0/+102
2010-01-03tests: move convenience regexp to match object names to test-lib.shLibravatar Junio C Hamano9-18/+6
2010-01-03Use warning function instead of fprintf(stderr, "Warning: ...").Libravatar Thiago Farina1-1/+1
2010-01-03"reset --merge": fix unmerged caseLibravatar Junio C Hamano1-9/+31
2010-01-03reset: use "unpack_trees()" directly instead of "git read-tree"Libravatar Stephan Beyer1-5/+7
2010-01-03git-difftool: Add '--gui' for selecting a GUI toolLibravatar David Aguilar1-0/+12
2010-01-03t7800-difftool: Set a bogus tool for use by testsLibravatar David Aguilar1-1/+2
2009-12-31Merge branch 'maint'Libravatar Junio C Hamano1-13/+13
2009-12-31Merge branch 'maint-1.6.0' into maintLibravatar Junio C Hamano1-13/+13
2009-12-31branch: die explicitly why when calling "git branch [-a|-r] branchname".Libravatar Matthieu Moy1-13/+13
2009-12-31Fix "git remote update" with remotes.defalt setLibravatar Björn Gustavsson1-0/+14
2009-12-31builtin-config: add --path option doing ~ and ~user expansion.Libravatar Matthieu Moy1-0/+28
2009-12-30builtin-push: add --delete as syntactic sugar for :fooLibravatar Jan Krüger1-0/+26
2009-12-30Merge branch 'maint'Libravatar Junio C Hamano1-7/+7
2009-12-30branch -d: base the "already-merged" safety on the branch it merges withLibravatar Junio C Hamano1-0/+26
2009-12-30Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano1-7/+7