summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/maint-1.6.5-reset-hard'Junio C Hamano2010-01-101-0/+6
|\
| * reset: unbreak hard resets with GIT_WORK_TREEJeff King2009-12-301-0/+6
* | Merge branch 'jk/push-to-delete'Junio C Hamano2010-01-101-0/+26
|\ \
| * | builtin-push: add --delete as syntactic sugar for :fooJan Krüger2009-12-301-0/+26
* | | Merge branch 'mm/config-path'Junio C Hamano2010-01-101-0/+28
|\ \ \
| * | | builtin-config: add --path option doing ~ and ~user expansion.Matthieu Moy2009-12-311-0/+28
| |/ /
* | | Merge branch 'bg/maint-remote-update-default'Junio C Hamano2010-01-101-0/+14
|\ \ \
| * | | Fix "git remote update" with remotes.defalt setBjörn Gustavsson2009-12-311-0/+14
* | | | Merge branch 'mm/diag-path-in-treeish'Junio C Hamano2010-01-101-0/+69
|\ \ \ \
| * | | | Detailed diagnosis when parsing an object name fails.Matthieu Moy2009-12-071-0/+69
* | | | | Merge branch 'sb/maint-octopus'Junio C Hamano2010-01-071-0/+51
|\ \ \ \ \
| * | | | | octopus: reenable fast-forward mergesStephen Boyd2009-12-131-0/+18
| * | | | | octopus: make merge process simpler to followStephen Boyd2009-12-131-0/+33
* | | | | | Merge branch 'mv/commit-date'Junio C Hamano2010-01-071-0/+15
|\ \ \ \ \ \
| * | | | | | builtin-commit: add --date optionMiklos Vajna2009-12-031-0/+15
* | | | | | | Merge branch 'mo/bin-wrappers'Junio C Hamano2010-01-072-12/+30
|\ \ \ \ \ \ \
| * | | | | | | run test suite without dashed git-commands in PATHMatthew Ogilvie2009-12-032-12/+30
* | | | | | | | Use warning function instead of fprintf(stderr, "Warning: ...").Thiago Farina2010-01-031-1/+1
* | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-311-13/+13
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-12-311-13/+13
| |\ \ \ \ \ \ \ \
| | * | | | | | | | branch: die explicitly why when calling "git branch [-a|-r] branchname".Matthieu Moy2009-12-311-13/+13
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-301-7/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-12-301-7/+7
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-12-291-7/+7
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | t7102: make the test fail if one of its check failsNguyễn Thái Ngọc Duy2009-12-291-7/+7
* | | | | | | | | | | Merge branch 'jk/1.7.0-status'Junio C Hamano2009-12-276-53/+351
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | status/commit: do not suggest "reset HEAD <path>" while mergingJunio C Hamano2009-12-121-1/+0
| * | | | | | | | | | | commit/status: "git add <path>" is not necessarily how to resolveJunio C Hamano2009-12-121-1/+1
| * | | | | | | | | | | t7508-status: test all modes with colorMichael J Gruber2009-12-083-44/+156
| * | | | | | | | | | | t7508-status: status --porcelain ignores relative paths settingMichael J Gruber2009-12-081-0/+18
| * | | | | | | | | | | t7508-status.sh: Add tests for status -sMichael J Gruber2009-11-271-0/+166
| * | | | | | | | | | | git status: not "commit --dry-run" anymoreJunio C Hamano2009-08-224-12/+16
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-262-29/+29
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | t4019 "grep" portability fixJunio C Hamano2009-12-261-28/+28
| * | | | | | | | | | | t1200: work around a bug in some implementations of "find"Junio C Hamano2009-12-261-1/+1
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'gb/1.7.0-diff-whitespace-only-output'Junio C Hamano2009-12-261-2/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | No diff -b/-w output for all-whitespace changesGreg Bacon2009-11-201-2/+12
* | | | | | | | | | | | Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano2009-12-261-0/+63
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make test case number uniqueJohannes Sixt2009-08-271-0/+0
| * | | | | | | | | | | | diff: change semantics of "ignore whitespace" optionsJunio C Hamano2009-07-291-0/+63
* | | | | | | | | | | | | Merge branch 'jc/1.7.0-push-safety'Junio C Hamano2009-12-267-17/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Refuse deleting the current branch via pushJunio C Hamano2009-07-291-7/+2
| * | | | | | | | | | | | | Refuse updating the current branch in a non-bare repository via pushJunio C Hamano2009-07-297-10/+23
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'sr/vcs-helper'Junio C Hamano2009-12-261-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | tests: handle NO_PYTHON settingJeff King2009-12-071-3/+3
| * | | | | | | | | | | | Add Python support library for remote helpersSverre Rabbelier2009-11-241-0/+9
| * | | | | | | | | | | | Basic build infrastructure for Python scriptsJohan Herland2009-11-171-0/+1
* | | | | | | | | | | | | git svn: add test for a git svn gc followed by a git svn mkdirsRobert Zeh2009-12-231-0/+40
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-221-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Prevent git blame from segfaulting on a missing author nameDavid Reiss2009-12-221-0/+13