aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'jc/checkout-merge-base'Junio C Hamano2010-01-13
|\
| * rebase -i: teach --onto A...B syntaxNanako Shiraishi2010-01-07
| * rebase: fix --onto A...B parsing and add testsNanako Shiraishi2010-01-07
| * "checkout A...B" switches to the merge base between A and BJunio C Hamano2009-10-18
* | Merge branch 'cc/reset-more'Junio C Hamano2010-01-13
|\ \
| * | t7111: check that reset options work as described in the tablesChristian Couder2010-01-09
| * | "reset --merge": fix unmerged caseJunio C Hamano2010-01-03
| * | reset: use "unpack_trees()" directly instead of "git read-tree"Stephan Beyer2010-01-03
| * | reset: add a few tests for "git reset --merge"Christian Couder2009-12-30
* | | Merge branch 'nd/sparse'Junio C Hamano2010-01-13
|\ \ \
| * | | t7002: test for not using external grep on skip-worktree pathsNguyễn Thái Ngọc Duy2010-01-06
| * | | t7002: set test prerequisite "external-grep" if supportedNguyễn Thái Ngọc Duy2010-01-06
| * | | commit: correctly respect skip-worktree bitNguyễn Thái Ngọc Duy2009-12-14
| * | | tests: rename duplicate t1009Jeff King2009-11-25
| * | | sparse checkout: inhibit empty worktreeNguyễn Thái Ngọc Duy2009-08-23
| * | | Add tests for sparse checkoutNguyễn Thái Ngọc Duy2009-08-23
| * | | Read .gitignore from index if it is skip-worktreeNguyễn Thái Ngọc Duy2009-08-23
| * | | Teach Git to respect skip-worktree bit (writing part)Nguyễn Thái Ngọc Duy2009-08-23
| * | | Teach Git to respect skip-worktree bit (reading part)Nguyễn Thái Ngọc Duy2009-08-23
| * | | Introduce "skip-worktree" bit in index, teach Git to get/set this bitNguyễn Thái Ngọc Duy2009-08-23
* | | | Merge branch 'maint'Junio C Hamano2010-01-12
|\ \ \ \
| * | | | remote-curl: Fix Accept header for smart HTTP connectionsShawn O. Pearce2010-01-12
* | | | | Merge branch 'jk/maint-1.6.5-reset-hard'Junio C Hamano2010-01-10
|\ \ \ \ \
| * | | | | reset: unbreak hard resets with GIT_WORK_TREEJeff King2009-12-30
* | | | | | Merge branch 'jk/push-to-delete'Junio C Hamano2010-01-10
|\ \ \ \ \ \
| * | | | | | builtin-push: add --delete as syntactic sugar for :fooJan Krüger2009-12-30
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'mm/config-path'Junio C Hamano2010-01-10
|\ \ \ \ \ \
| * | | | | | builtin-config: add --path option doing ~ and ~user expansion.Matthieu Moy2009-12-31
| |/ / / / /
* | | | | | Merge branch 'bg/maint-remote-update-default'Junio C Hamano2010-01-10
|\ \ \ \ \ \
| * | | | | | Fix "git remote update" with remotes.defalt setBjörn Gustavsson2009-12-31
* | | | | | | Merge branch 'mm/diag-path-in-treeish'Junio C Hamano2010-01-10
|\ \ \ \ \ \ \
| * | | | | | | Detailed diagnosis when parsing an object name fails.Matthieu Moy2009-12-07
* | | | | | | | Merge branch 'sb/maint-octopus'Junio C Hamano2010-01-07
|\ \ \ \ \ \ \ \
| * | | | | | | | octopus: reenable fast-forward mergesStephen Boyd2009-12-13
| * | | | | | | | octopus: make merge process simpler to followStephen Boyd2009-12-13
* | | | | | | | | Merge branch 'mv/commit-date'Junio C Hamano2010-01-07
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin-commit: add --date optionMiklos Vajna2009-12-03
* | | | | | | | | | Merge branch 'mo/bin-wrappers'Junio C Hamano2010-01-07
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | run test suite without dashed git-commands in PATHMatthew Ogilvie2009-12-03
* | | | | | | | | | | Use warning function instead of fprintf(stderr, "Warning: ...").Thiago Farina2010-01-03
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-31
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-12-31
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | branch: die explicitly why when calling "git branch [-a|-r] branchname".Matthieu Moy2009-12-31
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-30
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-12-30
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-12-29
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | t7102: make the test fail if one of its check failsNguyễn Thái Ngọc Duy2009-12-29
* | | | | | | | | | | | | Merge branch 'jk/1.7.0-status'Junio C Hamano2009-12-27
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | status/commit: do not suggest "reset HEAD <path>" while mergingJunio C Hamano2009-12-12
| * | | | | | | | | | | | | commit/status: "git add <path>" is not necessarily how to resolveJunio C Hamano2009-12-12