Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jc/checkout-merge-base' | Junio C Hamano | 2010-01-13 |
|\ | |||
| * | rebase -i: teach --onto A...B syntax | Nanako Shiraishi | 2010-01-07 |
| * | rebase: fix --onto A...B parsing and add tests | Nanako Shiraishi | 2010-01-07 |
| * | "checkout A...B" switches to the merge base between A and B | Junio C Hamano | 2009-10-18 |
* | | Merge branch 'cc/reset-more' | Junio C Hamano | 2010-01-13 |
|\ \ | |||
| * | | t7111: check that reset options work as described in the tables | Christian Couder | 2010-01-09 |
| * | | "reset --merge": fix unmerged case | Junio C Hamano | 2010-01-03 |
| * | | reset: use "unpack_trees()" directly instead of "git read-tree" | Stephan Beyer | 2010-01-03 |
| * | | reset: add a few tests for "git reset --merge" | Christian Couder | 2009-12-30 |
* | | | Merge branch 'nd/sparse' | Junio C Hamano | 2010-01-13 |
|\ \ \ | |||
| * | | | t7002: test for not using external grep on skip-worktree paths | Nguyễn Thái Ngọc Duy | 2010-01-06 |
| * | | | t7002: set test prerequisite "external-grep" if supported | Nguyễn Thái Ngọc Duy | 2010-01-06 |
| * | | | commit: correctly respect skip-worktree bit | Nguyễn Thái Ngọc Duy | 2009-12-14 |
| * | | | tests: rename duplicate t1009 | Jeff King | 2009-11-25 |
| * | | | sparse checkout: inhibit empty worktree | Nguyễn Thái Ngọc Duy | 2009-08-23 |
| * | | | Add tests for sparse checkout | Nguyễn Thái Ngọc Duy | 2009-08-23 |
| * | | | Read .gitignore from index if it is skip-worktree | Nguyễn Thái Ngọc Duy | 2009-08-23 |
| * | | | Teach Git to respect skip-worktree bit (writing part) | Nguyễn Thái Ngọc Duy | 2009-08-23 |
| * | | | Teach Git to respect skip-worktree bit (reading part) | Nguyễn Thái Ngọc Duy | 2009-08-23 |
| * | | | Introduce "skip-worktree" bit in index, teach Git to get/set this bit | Nguyễn Thái Ngọc Duy | 2009-08-23 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-01-12 |
|\ \ \ \ | |||
| * | | | | remote-curl: Fix Accept header for smart HTTP connections | Shawn O. Pearce | 2010-01-12 |
* | | | | | Merge branch 'jk/maint-1.6.5-reset-hard' | Junio C Hamano | 2010-01-10 |
|\ \ \ \ \ | |||
| * | | | | | reset: unbreak hard resets with GIT_WORK_TREE | Jeff King | 2009-12-30 |
* | | | | | | Merge branch 'jk/push-to-delete' | Junio C Hamano | 2010-01-10 |
|\ \ \ \ \ \ | |||
| * | | | | | | builtin-push: add --delete as syntactic sugar for :foo | Jan Krüger | 2009-12-30 |
| | |_|_|/ / | |/| | | | | |||
* | | | | | | Merge branch 'mm/config-path' | Junio C Hamano | 2010-01-10 |
|\ \ \ \ \ \ | |||
| * | | | | | | builtin-config: add --path option doing ~ and ~user expansion. | Matthieu Moy | 2009-12-31 |
| |/ / / / / | |||
* | | | | | | Merge branch 'bg/maint-remote-update-default' | Junio C Hamano | 2010-01-10 |
|\ \ \ \ \ \ | |||
| * | | | | | | Fix "git remote update" with remotes.defalt set | Björn Gustavsson | 2009-12-31 |
* | | | | | | | Merge branch 'mm/diag-path-in-treeish' | Junio C Hamano | 2010-01-10 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Detailed diagnosis when parsing an object name fails. | Matthieu Moy | 2009-12-07 |
* | | | | | | | | Merge branch 'sb/maint-octopus' | Junio C Hamano | 2010-01-07 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | octopus: reenable fast-forward merges | Stephen Boyd | 2009-12-13 |
| * | | | | | | | | octopus: make merge process simpler to follow | Stephen Boyd | 2009-12-13 |
* | | | | | | | | | Merge branch 'mv/commit-date' | Junio C Hamano | 2010-01-07 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | builtin-commit: add --date option | Miklos Vajna | 2009-12-03 |
* | | | | | | | | | | Merge branch 'mo/bin-wrappers' | Junio C Hamano | 2010-01-07 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | run test suite without dashed git-commands in PATH | Matthew Ogilvie | 2009-12-03 |
* | | | | | | | | | | | Use warning function instead of fprintf(stderr, "Warning: ..."). | Thiago Farina | 2010-01-03 |
* | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-12-31 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-12-31 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | branch: die explicitly why when calling "git branch [-a|-r] branchname". | Matthieu Moy | 2009-12-31 |
* | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-12-30 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||
| * | | | | | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-12-30 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-12-29 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | |||
| | | * | | | | | | | | | | t7102: make the test fail if one of its check fails | Nguyễn Thái Ngọc Duy | 2009-12-29 |
* | | | | | | | | | | | | | Merge branch 'jk/1.7.0-status' | Junio C Hamano | 2009-12-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | status/commit: do not suggest "reset HEAD <path>" while merging | Junio C Hamano | 2009-12-12 |
| * | | | | | | | | | | | | | commit/status: "git add <path>" is not necessarily how to resolve | Junio C Hamano | 2009-12-12 |