Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'jn/fast-import-subtree' | Junio C Hamano | 2010-08-18 | 1 | -0/+54 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Teach fast-import to import subtrees named by tree id | Jonathan Nieder | 2010-07-05 | 1 | -0/+54 |
* | | | | | | | Merge branch 'tc/checkout-B' | Junio C Hamano | 2010-08-18 | 1 | -0/+172 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | builtin/checkout: handle -B from detached HEAD correctly | Tay Ray Chuan | 2010-08-09 | 1 | -0/+6 |
| * | | | | | | | builtin/checkout: learn -B | Tay Ray Chuan | 2010-06-25 | 1 | -0/+45 |
| * | | | | | | | add tests for checkout -b | Tay Ray Chuan | 2010-06-25 | 1 | -0/+121 |
* | | | | | | | | mergetool: Skip autoresolved paths | David Aguilar | 2010-08-17 | 1 | -12/+34 |
* | | | | | | | | git-svn: fix fetch with deleted tag | David D. Kilzer | 2010-08-15 | 2 | -0/+86 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-12 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | t/t7003: replace \t with literal tab in sed expression | Brandon Casey | 2010-08-12 | 1 | -1/+1 |
| * | | | | | | | index-pack: Don't follow replace refs. | Nelson Elhage | 2010-08-12 | 1 | -0/+6 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-11 | 3 | -3/+120 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | fast-import: export correctly marks larger than 2^20-1 | Raja R Harinath | 2010-08-11 | 1 | -0/+57 |
| * | | | | | | | t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH | Ævar Arnfjörð Bjarmason | 2010-08-11 | 1 | -3/+2 |
| * | | | | | | | diff: strip extra "/" when stripping prefix | Jakub Narebski | 2010-08-11 | 1 | -0/+61 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-08-09 | 2 | -1/+19 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | t7003: fix subdirectory-filter test | Thomas Rast | 2010-08-09 | 1 | -1/+2 |