summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | | Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributesHuynh Khoi Nguyen Nguyen2012-06-251-0/+29
| * | | | | | | | Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignoreHuynh Khoi Nguyen Nguyen2012-06-251-0/+29
| * | | | | | | | config: read (but not write) from $XDG_CONFIG_HOME/git/config fileHuynh Khoi Nguyen Nguyen2012-06-251-0/+70
| |/ / / / / / /
* | | | | | | | Merge branch 'nd/clone-single-fix'Junio C Hamano2012-07-041-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | clone: fix ref selection in --single-branch --branch=xxxNguyễn Thái Ngọc Duy2012-06-221-1/+6
* | | | | | | | | Merge branch 'th/diff-no-index-fixes'Junio C Hamano2012-07-042-2/+86
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds ch...Tim Henigan2012-06-221-1/+72
| * | | | | | | | | diff: handle relative paths in no-indexJeff King2012-06-221-1/+14
| |/ / / / / / / /
| * | | | | | | | Merge branch 'ef/maint-rebase-error-message' into maintJunio C Hamano2012-06-031-0/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/maint-grep-F' into maintJunio C Hamano2012-06-011-0/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/ident-split-fix' into maintJunio C Hamano2012-06-011-0/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'hv/submodule-alt-odb' into maintJunio C Hamano2012-05-251-0/+34
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bp/diff-no-index-strbuf-fix' into maintJunio C Hamano2012-05-251-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-status-porcelain-z-b' into maintJunio C Hamano2012-05-241-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hv/remote-end-hung-up'Junio C Hamano2012-07-041-9/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | remove the impression of unexpectedness when access is deniedHeiko Voigt2012-06-191-9/+7
* | | | | | | | | | | | | | | | Merge branch 'fc/git-prompt-script'Junio C Hamano2012-06-283-13/+475
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \