summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/diff-no-rename-empty'Junio C Hamano2012-04-161-0/+16
|\
| * merge-recursive: don't detect renames of empty filesjk/diff-no-rename-emptyJeff King2012-03-231-0/+16
* | Merge branch 'jc/maint-clean-nested-worktree-in-subdir'Junio C Hamano2012-04-161-5/+22
|\ \
| * | clean: preserve nested git worktree in subdirectoriesjc/maint-clean-nested-worktree-in-subdirJunio C Hamano2012-03-151-5/+22
* | | Merge branch 'da/difftool-test'Junio C Hamano2012-04-151-0/+11
|\ \ \
| * | | t7800: Test difftool passing arguments to diffda/difftool-testDavid Aguilar2012-03-191-0/+11
| | |/ | |/|
* | | Merge branch 'zj/test-cred-helper-nicer-prove'Junio C Hamano2012-04-151-24/+45
|\ \ \
| * | | t0303: resurrect commit message as test documentationzj/test-cred-helper-nicer-proveZbigniew Jędrzejewski-Szmek2012-03-151-1/+29
| * | | t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPERZbigniew Jędrzejewski-Szmek2012-03-151-23/+16
* | | | Merge branch 'jh/notes-merge-in-git-dir-worktree'Junio C Hamano2012-04-151-4/+23
|\ \ \ \
| * | | | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdjh/notes-merge-in-git-dir-worktreeJohan Herland2012-03-151-4/+4
| * | | | notes-merge: use opendir/readdir instead of using read_directory()Johan Herland2012-03-151-1/+1
| * | | | t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/Johan Herland2012-03-151-0/+19
| | |_|/ | |/| |
* | | | Merge branch 'tr/maint-word-diff-regex-sticky'Junio C Hamano2012-04-151-0/+36
|\ \ \ \
| * | | | diff: tweak a _copy_ of diff_options with word-difftr/maint-word-diff-regex-stickyThomas Rast2012-03-141-1/+1
| * | | | t4034: diff.*.wordregex should not be "sticky" in --word-diffJohannes Sixt2012-03-141-0/+36
| | |/ / | |/| |
| * | | Merge branch 'tr/maint-bundle-boundary' into maintJunio C Hamano2012-03-121-22/+35
| |\ \ \
| * \ \ \ Merge branch 'jc/maint-diff-patch-header' into maintJunio C Hamano2012-03-121-85/+110
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/am-3-nonstandard-popt' into maintJunio C Hamano2012-03-121-0/+15
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jn/diffstat-tests'Junio C Hamano2012-04-1516-259/+354
|\ \ \ \ \ \
| * | | | | | diffstat summary line varies by locale: miscellanyjn/diffstat-testsJonathan Nieder2012-03-138-64/+96
| * | | | | | test: use numstat instead of diffstat in binary-diff testJonathan Nieder2012-03-131-6/+23
| * | | | | | test: use --numstat instead of --stat in "git stash show" testsJonathan Nieder2012-03-131-7/+19
| * | | | | | test: test cherry-pick functionality and output separatelyJonathan Nieder2012-03-131-8/+22
| * | | | | | test: modernize funny-names test styleJonathan Nieder2012-03-131-167/+180
| * | | | | | test: use numstat instead of diffstat in funny-names testJonathan Nieder2012-03-131-10/+17
| * | | | | | test: use test_i18ncmp when checking --stat outputJonathan Nieder2012-03-138-16/+16
* | | | | | | Merge branch 'jc/commit-hook-authorship'Junio C Hamano2012-04-151-0/+18
|\ \ \ \ \ \ \
| * | | | | | | commit: pass author/committer info to hooksjc/commit-hook-authorshipJunio C Hamano2012-03-111-1/+1
| * | | | | | | t7503: does pre-commit-hook learn authorship?Junio C Hamano2012-03-111-0/+18
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'nd/stream-more'Junio C Hamano2012-04-151-2/+36
|\ \ \ \ \ \ \
| * | | | | | | update-server-info: respect core.bigfilethresholdnd/stream-moreNguyễn Thái Ngọc Duy2012-03-071-1/+1
| * | | | | | | show: use streaming API for showing blobsNguyễn Thái Ngọc Duy2012-03-071-1/+1
| * | | | | | | cat-file: use streaming API to print blobsNguyễn Thái Ngọc Duy2012-03-071-2/+2
| * | | | | | | Add more large blob test casesNguyễn Thái Ngọc Duy2012-03-071-2/+36
* | | | | | | | merge overwrites unstaged changes in renamed fileClemens Buchacher2012-04-151-0/+9
* | | | | | | | tests: unset COLUMNS inherited from environmentZbigniew Jędrzejewski-Szmek2012-03-271-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge "two fixes for fast-import's 'ls' command" from JonathanJunio C Hamano2012-03-161-0/+39
|\ \ \ \ \ \ \
| * | | | | | | fast-import: don't allow 'ls' of path with empty componentsjn/maint-fast-import-empty-lsJonathan Nieder2012-03-091-0/+39
* | | | | | | | Merge branch 'jc/maint-undefined-i18n-observation-test'Junio C Hamano2012-03-131-14/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | t0204: clarify the "observe undefined behaviour" testjc/maint-undefined-i18n-observation-testJunio C Hamano2012-03-091-14/+23
* | | | | | | | | Merge branch 'ms/maint-config-error-at-eol-linecount'Junio C Hamano2012-03-131-0/+31
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | config: report errors at the EOL with correct line numberms/maint-config-error-at-eol-linecountMartin Stenberg2012-03-121-0/+31
* | | | | | | | | p4000: use -3000 when promising -3000Thomas Rast2012-03-091-1/+1
* | | | | | | | | Merge branch 'jl/maint-submodule-relative'Junio C Hamano2012-03-082-0/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodules: refactor computation of relative gitdir pathJens Lehmann2012-03-041-0/+17
| * | | | | | | | | submodules: always use a relative path from gitdir to work treeJens Lehmann2012-03-041-0/+20
| * | | | | | | | | submodules: always use a relative path to gitdirJens Lehmann2012-03-041-0/+2
* | | | | | | | | | perf: export some important test-lib variablesThomas Rast2012-03-082-1/+14
* | | | | | | | | | perf: load test-lib-functions from the correct directoryThomas Rast2012-03-082-1/+6
View Lorry Controller Status