Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mm/rebase-i-exec' | Junio C Hamano | 2010-08-21 | 5 | -5/+107 |
|\ | |||||
| * | test-lib: user-friendly alternatives to test [-d|-f|-e] | Matthieu Moy | 2010-08-11 | 4 | -12/+51 |
| * | rebase -i: add exec command to launch a shell command | Matthieu Moy | 2010-08-11 | 2 | -0/+63 |
* | | Merge branch 'mm/shortopt-detached' | Junio C Hamano | 2010-08-21 | 4 | -7/+30 |
|\ \ | |||||
| * | | log: parse separate option for --glob | Matthieu Moy | 2010-08-06 | 1 | -0/+6 |
| * | | log: parse separate options like git log --grep foo | Matthieu Moy | 2010-08-06 | 1 | -0/+7 |
| * | | diff: parse separate options like -S foo | Matthieu Moy | 2010-08-06 | 3 | -7/+17 |
| |/ | |||||
* | | Merge branch 'nd/fix-sparse-checkout' | Junio C Hamano | 2010-08-21 | 1 | -47/+76 |
|\ \ | |||||
| * | | unpack-trees: mark new entries skip-worktree appropriately | Nguyễn Thái Ngọc Duy | 2010-08-09 | 1 | -1/+1 |
| * | | unpack-trees: let read-tree -u remove index entries outside sparse area | Nguyễn Thái Ngọc Duy | 2010-08-09 | 1 | -1/+10 |
| * | | unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set | Nguyễn Thái Ngọc Duy | 2010-08-09 | 1 | -0/+12 |
| * | | t1011 (sparse checkout): style nitpicks | Jonathan Nieder | 2010-08-02 | 1 | -47/+55 |
* | | | Merge branch 'hv/submodule-find-ff-merge' | Junio C Hamano | 2010-08-21 | 1 | -6/+122 |
|\ \ \ | |||||
| * | | | Implement automatic fast-forward merge for submodules | Heiko Voigt | 2010-07-07 | 1 | -6/+122 |
* | | | | Merge branch 'en/rebase-against-rebase-fix' | Junio C Hamano | 2010-08-21 | 1 | -0/+62 |
|\ \ \ \ | |||||
| * | | | | pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches | Elijah Newren | 2010-08-12 | 1 | -2/+2 |
| * | | | | t5520-pull: Add testcases showing spurious conflicts from git pull --rebase | Elijah Newren | 2010-08-12 | 1 | -0/+62 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-08-21 | 4 | -3/+130 |
|\ \ \ \ | |||||
| * | | | | t7609: test merge and checkout error messages | Diane Gasselin | 2010-08-11 | 1 | -0/+125 |
| * | | | | unpack_trees: group error messages by type | Matthieu Moy | 2010-08-11 | 3 | -3/+5 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'po/userdiff-csharp' | Junio C Hamano | 2010-08-21 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Userdiff patterns for C# | Petr Onderka | 2010-08-16 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-21 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | t7403: add missing &&'s | Jens Lehmann | 2010-08-21 | 1 | -2/+2 |
| * | | | | Merge branch 'jc/maint-follow-rename-fix' into maint | Junio C Hamano | 2010-08-20 | 1 | -1/+13 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jn/fix-abbrev' into maint | Junio C Hamano | 2010-08-20 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jn/rebase-rename-am' into maint | Junio C Hamano | 2010-08-20 | 3 | -199/+343 |
| |\ \ \ \ \ \ | |||||
* | | | | | | | | t9155: fix compatibility with older SVN | Eric Wong | 2010-08-19 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jc/maint-follow-rename-fix' | Junio C Hamano | 2010-08-18 | 1 | -1/+13 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | log: test for regression introduced in v1.7.2-rc0~103^2~2 | Ævar Arnfjörð Bjarmason | 2010-08-15 | 1 | -1/+13 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'cc/find-commit-subject' | Junio C Hamano | 2010-08-18 | 1 | -1/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | revert: fix off by one read when searching the end of a commit subject | Christian Couder | 2010-07-23 | 1 | -1/+19 |
* | | | | | | | | Merge branch 'jl/submodule-ignore-diff' | Junio C Hamano | 2010-08-18 | 2 | -4/+339 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add tests for the diff.ignoreSubmodules config option | Jens Lehmann | 2010-08-09 | 2 | -3/+19 |
| * | | | | | | | | Submodules: Use "ignore" settings from .gitmodules too for diff and status | Jens Lehmann | 2010-08-09 | 2 | -8/+159 |
| * | | | | | | | | Submodules: Add the new "ignore" config option for diff and status | Jens Lehmann | 2010-08-09 | 2 | -4/+172 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ml/rebase-x-strategy' | Junio C Hamano | 2010-08-18 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rebase: support -X to pass through strategy options | Mike Lundy | 2010-08-03 | 1 | -0/+9 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jn/fix-abbrev' | Junio C Hamano | 2010-08-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | archive: abbreviate substituted commit ids again | Jonathan Nieder | 2010-07-27 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jh/use-test-must-fail' | Junio C Hamano | 2010-08-18 | 11 | -26/+26 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Convert "! git" to "test_must_fail git" | Jared Hance | 2010-07-20 | 11 | -26/+26 |
* | | | | | | | | | Merge branch 'jh/clean-exclude' | Junio C Hamano | 2010-08-18 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add test for git clean -e. | Jared Hance | 2010-07-20 | 1 | -0/+16 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jn/rebase-rename-am' | Junio C Hamano | 2010-08-18 | 3 | -199/+343 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | rebase: protect against diff.renames configuration | Junio C Hamano | 2010-07-23 | 1 | -1/+23 |
| * | | | | | | | | t3400 (rebase): whitespace cleanup | Jonathan Nieder | 2010-07-23 | 1 | -90/+92 |
| * | | | | | | | | Teach "apply --index-info" to handle rename patches | Junio C Hamano | 2010-07-23 | 1 | -0/+46 |
| * | | | | | | | | t4150 (am): futureproof against failing tests | Jonathan Nieder | 2010-07-23 | 1 | -1/+47 |
| * | | | | | | | | t4150 (am): style fix | Jonathan Nieder | 2010-07-23 | 2 | -108/+136 |
| | |_|/ / / / / | |/| | | | | | |