summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mz/reset-misc'Junio C Hamano2013-01-223-7/+73
|\
| * reset: allow reset on unborn branchMartin von Zweigbergk2013-01-151-0/+52
| * reset $sha1 $pathspec: require $sha1 only to be treeishMartin von Zweigbergk2013-01-151-0/+8
| * reset $pathspec: exit with code 0 if successfulMartin von Zweigbergk2013-01-152-7/+13
* | Merge branch 'pw/p4-branch-fixes'Junio C Hamano2013-01-212-9/+128
|\ \
| * | git p4: fix submit when no master branchPete Wyckoff2013-01-151-0/+25
| * | git p4 test: keep P4CLIENT changes inside subshellsPete Wyckoff2013-01-151-2/+5
| * | git p4: fix sync --branch when no master branchPete Wyckoff2013-01-151-4/+4
| * | git p4: fail gracefully on sync with no master branchPete Wyckoff2013-01-151-5/+4
| * | git p4: allow short ref names to --branchPete Wyckoff2013-01-151-0/+21
| * | git p4: clone --branch should checkout masterPete Wyckoff2013-01-151-1/+1
| * | git p4: verify expected refs in clone --bare testPete Wyckoff2013-01-151-3/+6
| * | git p4: create p4/HEAD on initial clonePete Wyckoff2013-01-151-0/+23
| * | git p4: test sync/clone --branch behaviorPete Wyckoff2013-01-151-4/+49
* | | Merge branch 'rt/commit-cleanup-config'Junio C Hamano2013-01-202-7/+82
|\ \ \
| * | | commit: make default of "cleanup" option configurableRalf Thielow2013-01-102-7/+82
| | |/ | |/|
* | | Merge branch 'ap/log-mailmap'Junio C Hamano2013-01-201-0/+56
|\ \ \
| * | | log: add log.mailmap configuration optionAntoine Pelisse2013-01-101-0/+24
| * | | log: grep author/committer using mailmapAntoine Pelisse2013-01-101-0/+18
| * | | test: add test for --use-mailmap optionAntoine Pelisse2013-01-101-0/+14
* | | | Merge branch 'nd/fix-perf-parameters-in-tests'Junio C Hamano2013-01-181-1/+1
|\ \ \ \
| * | | | test-lib.sh: unfilter GIT_PERF_*Nguyễn Thái Ngọc Duy2013-01-151-1/+1
| | |_|/ | |/| |
| * | | Merge branch 'jk/unify-exit-code-by-receiving-signal' into maintJunio C Hamano2013-01-141-1/+1
| |\ \ \
| * \ \ \ Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maintJunio C Hamano2013-01-141-1/+11
| |\ \ \ \
| * \ \ \ \ Merge branch 'mk/maint-graph-infinity-loop' into maintJunio C Hamano2013-01-141-0/+10
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/enable-test-lint-by-default' into maintJunio C Hamano2013-01-111-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maintJunio C Hamano2013-01-111-0/+14
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'as/test-name-alias-uniquely' into maintJunio C Hamano2013-01-111-6/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ja/directory-attrs' into maintJunio C Hamano2013-01-111-0/+57
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/fetch-ignore-symref' into maintJunio C Hamano2013-01-111-0/+42
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/test-t9810-no-sed-i' into maintJunio C Hamano2013-01-101-10/+14
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/test-t9020-no-which' into maintJunio C Hamano2013-01-101-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/shortlog-missing-lf' into maintJunio C Hamano2013-01-101-0/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/invalidate-i-t-a-cache-tree' into maintJunio C Hamano2013-01-101-0/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fc/remote-testgit-feature-done'Junio C Hamano2013-01-141-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | remote-testgit: properly check for errorsFelipe Contreras2012-10-291-0/+21
* | | | | | | | | | | | | | | | | Merge branch 'ap/status-ignored-in-ignored-directory'Junio C Hamano2013-01-141-0/+146
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | git-status: Test --ignored behaviorAntoine Pelisse2013-01-011-0/+146
* | | | | | | | | | | | | | | | | | Merge branch 'rs/zip-tests'Junio C Hamano2013-01-115-80/+140
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t5003: check if unzip supports symlinksRené Scharfe2013-01-072-7/+19
| * | | | | | | | | | | | | | | | | | t5000, t5003: move ZIP tests into their own scriptRené Scharfe2013-01-072-69/+119
| * | | | | | | | | | | | | | | | | | t0024, t5000: use test_lazy_prereq for UNZIPRené Scharfe2013-01-072-14/+10
| * | | | | | | | | | | | | | | | | | t0024, t5000: clear variable UNZIP, use GIT_UNZIP insteadRené Scharfe2013-01-063-8/+10
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/unify-exit-code-by-receiving-signal'Junio C Hamano2013-01-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | run-command: encode signal death as a positive integerJeff King2013-01-061-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/merge-blobs'Junio C Hamano2013-01-111-0/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | merge-tree: fix d/f conflictsJunio C Hamano2012-12-261-2/+2
| * | | | | | | | | | | | | | | | | | | merge-tree: add comments to clarify what these functions are doingJunio C Hamano2012-12-261-0/+44
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/format-patch-reroll'Junio C Hamano2013-01-111-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | format-patch: give --reroll-count a short synonym -vJunio C Hamano2013-01-031-0/+8
View Lorry Controller Status