summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/apply-3way'Junio C Hamano2012-07-152-0/+165
|\
| * apply: tests for the --3way optionJunio C Hamano2012-07-091-0/+54
| * apply: allow rerere() to work on --3way resultsJunio C Hamano2012-07-091-0/+25
| * apply: register conflicted stages to the indexJunio C Hamano2012-07-091-0/+78
| * apply: accept -3/--3way command line optionJunio C Hamano2012-07-091-0/+8
* | Merge branch 'cw/rebase-i-root'Junio C Hamano2012-07-152-5/+31
|\ \
| * | t3404: make test 57 work with dash and othersMichael J Gruber2012-07-051-1/+5
| * | Add tests for rebase -i --root without --ontoChris Webb2012-06-262-4/+27
* | | Merge branch 'pw/git-p4-move'Junio C Hamano2012-07-151-8/+8
|\ \ \
| * | | git p4: add support for 'p4 move' in P4SubmitGary Gibbons2012-07-121-8/+8
* | | | Merge branch 'pw/git-p4-jobs'Junio C Hamano2012-07-133-5/+168
|\ \ \ \
| * | | | git p4: notice Jobs lines in git commit messagesPete Wyckoff2012-07-051-0/+155
| * | | | git p4 test: refactor marshal_dumpPete Wyckoff2012-07-052-5/+13
| |/ / /
* | | | Merge branch 'jc/refactor-diff-stdin'Junio C Hamano2012-07-131-0/+12
|\ \ \ \
| * | | | diff-index.c: "git diff" has no need to read blob from the standard inputJunio C Hamano2012-06-281-0/+12
* | | | | Merge branch 'tb/sanitize-decomposed-utf-8-pathname'Junio C Hamano2012-07-131-0/+164
|\ \ \ \ \
| * | | | | git on Mac OS and precomposed unicodeTorsten Bögershausen2012-07-081-0/+164
* | | | | | Merge branch 'tr/maint-show-walk'Junio C Hamano2012-07-131-0/+91
|\ \ \ \ \ \
| * | | | | | show: fix "range implies walking"Junio C Hamano2012-06-191-2/+2
| * | | | | | Demonstrate git-show is broken with rangesThomas Rast2012-06-191-0/+91
* | | | | | | Merge branch 'mz/rebase-no-mbox'Junio C Hamano2012-07-132-5/+35
|\ \ \ \ \ \ \
| * | | | | | | am --rebasing: get patch body from commit, not from mailboxMartin von Zweigbergk2012-06-261-4/+28
| * | | | | | | rebase --root: print usage on too many argsMartin von Zweigbergk2012-06-261-1/+7
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'mz/empty-rebase-test'Junio C Hamano2012-07-091-0/+8
|\ \ \ \ \ \ \
| * | | | | | | add test case for rebase of empty commitMartin von Zweigbergk2012-06-271-0/+8
* | | | | | | | Merge branch 'pw/git-p4-tests'Junio C Hamano2012-07-099-433/+574
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | git p4 test: fix badp4dir testPete Wyckoff2012-06-271-3/+7
| * | | | | | | git p4 test: split up big t9800 testPete Wyckoff2012-06-274-397/+506
| * | | | | | | git p4 test: cleanup_git should make a new $gitPete Wyckoff2012-06-273-2/+3
| * | | | | | | git p4 test: copy source indeterminatePete Wyckoff2012-06-271-2/+2
| * | | | | | | git p4 test: check for error message in failed testPete Wyckoff2012-06-271-1/+2
| * | | | | | | git p4 test: rename some "git-p4 command" stringsPete Wyckoff2012-06-271-3/+3
| * | | | | | | git p4 test: never create default test repoPete Wyckoff2012-06-271-0/+4
| * | | | | | | git p4 test: simplify quoting involving TRASH_DIRECTORYPete Wyckoff2012-06-274-21/+17
| * | | | | | | git p4 test: use real_path to resolve p4 client symlinksPete Wyckoff2012-06-273-3/+3
| * | | | | | | git p4 test: wait longer for p4d to start and test its pidPete Wyckoff2012-06-271-6/+32
* | | | | | | | Merge branch 'js/fast-export-paths-with-spaces'Junio C Hamano2012-07-091-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fast-export: quote paths with spacesJay Soffian2012-06-271-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'cw/no-detaching-an-unborn'Junio C Hamano2012-07-091-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | git-checkout: disallow --detach on unborn branchChris Webb2012-06-261-0/+6
* | | | | | | | | Merge branch 'vr/use-our-perl-in-tests'Junio C Hamano2012-07-0926-44/+65
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/README: add a bit more Don'tsJunio C Hamano2012-06-241-3/+22
| * | | | | | | | | tests: enclose $PERL_PATH in double quotesJunio C Hamano2012-06-2424-41/+41
| * | | | | | | | | t/test-lib.sh: export PERL_PATH for use in scriptsJunio C Hamano2012-06-241-0/+2
| * | | | | | | | | t: Replace 'perl' by $PERL_PATHVincent van Ravesteijn2012-06-1224-41/+41
* | | | | | | | | | Merge branch 'mm/credential-plumbing'Junio C Hamano2012-07-092-2/+51
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git credential fill: output the whole 'struct credential'Matthieu Moy2012-06-252-0/+39
| * | | | | | | | | | add 'git credential' plumbing commandJavier Roucher Iglesias2012-06-251-2/+12
* | | | | | | | | | | Merge branch 'mm/config-xdg'Junio C Hamano2012-07-091-0/+158
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config: write to $XDG_CONFIG_HOME/git/config file when appropriateHuynh Khoi Nguyen Nguyen2012-06-251-0/+30