summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mm/rebase-i-exec'Junio C Hamano2010-08-215-5/+107
|\
| * test-lib: user-friendly alternatives to test [-d|-f|-e]Matthieu Moy2010-08-114-12/+51
| * rebase -i: add exec command to launch a shell commandMatthieu Moy2010-08-112-0/+63
* | Merge branch 'mm/shortopt-detached'Junio C Hamano2010-08-214-7/+30
|\ \
| * | log: parse separate option for --globMatthieu Moy2010-08-061-0/+6
| * | log: parse separate options like git log --grep fooMatthieu Moy2010-08-061-0/+7
| * | diff: parse separate options like -S fooMatthieu Moy2010-08-063-7/+17
| |/
* | Merge branch 'nd/fix-sparse-checkout'Junio C Hamano2010-08-211-47/+76
|\ \
| * | unpack-trees: mark new entries skip-worktree appropriatelyNguyễn Thái Ngọc Duy2010-08-091-1/+1
| * | unpack-trees: let read-tree -u remove index entries outside sparse areaNguyễn Thái Ngọc Duy2010-08-091-1/+10
| * | unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always setNguyễn Thái Ngọc Duy2010-08-091-0/+12
| * | t1011 (sparse checkout): style nitpicksJonathan Nieder2010-08-021-47/+55
* | | Merge branch 'hv/submodule-find-ff-merge'Junio C Hamano2010-08-211-6/+122
|\ \ \
| * | | Implement automatic fast-forward merge for submodulesHeiko Voigt2010-07-071-6/+122
* | | | Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano2010-08-211-0/+62
|\ \ \ \
| * | | | pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren2010-08-121-2/+2
| * | | | t5520-pull: Add testcases showing spurious conflicts from git pull --rebaseElijah Newren2010-08-121-0/+62
| | |/ / | |/| |
* | | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-08-214-3/+130
|\ \ \ \
| * | | | t7609: test merge and checkout error messagesDiane Gasselin2010-08-111-0/+125
| * | | | unpack_trees: group error messages by typeMatthieu Moy2010-08-113-3/+5
| | |_|/ | |/| |
* | | | Merge branch 'po/userdiff-csharp'Junio C Hamano2010-08-211-1/+1
|\ \ \ \
| * | | | Userdiff patterns for C#Petr Onderka2010-08-161-1/+1
| |/ / /
* | | | Merge branch 'maint'Junio C Hamano2010-08-211-2/+2
|\ \ \ \
| * | | | t7403: add missing &&'sJens Lehmann2010-08-211-2/+2
| * | | | Merge branch 'jc/maint-follow-rename-fix' into maintJunio C Hamano2010-08-201-1/+13
| |\ \ \ \
| * \ \ \ \ Merge branch 'jn/fix-abbrev' into maintJunio C Hamano2010-08-201-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jn/rebase-rename-am' into maintJunio C Hamano2010-08-203-199/+343
| |\ \ \ \ \ \
* | | | | | | | t9155: fix compatibility with older SVNEric Wong2010-08-191-1/+1
* | | | | | | | Merge branch 'jc/maint-follow-rename-fix'Junio C Hamano2010-08-181-1/+13
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | log: test for regression introduced in v1.7.2-rc0~103^2~2Ævar Arnfjörð Bjarmason2010-08-151-1/+13
| |/ / / / / /
* | | | | | | Merge branch 'cc/find-commit-subject'Junio C Hamano2010-08-181-1/+19
|\ \ \ \ \ \ \
| * | | | | | | revert: fix off by one read when searching the end of a commit subjectChristian Couder2010-07-231-1/+19
* | | | | | | | Merge branch 'jl/submodule-ignore-diff'Junio C Hamano2010-08-182-4/+339
|\ \ \ \ \ \ \ \
| * | | | | | | | Add tests for the diff.ignoreSubmodules config optionJens Lehmann2010-08-092-3/+19
| * | | | | | | | Submodules: Use "ignore" settings from .gitmodules too for diff and statusJens Lehmann2010-08-092-8/+159
| * | | | | | | | Submodules: Add the new "ignore" config option for diff and statusJens Lehmann2010-08-092-4/+172
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'ml/rebase-x-strategy'Junio C Hamano2010-08-181-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase: support -X to pass through strategy optionsMike Lundy2010-08-031-0/+9
| |/ / / / / / /
* | | | | | | | Merge branch 'jn/fix-abbrev'Junio C Hamano2010-08-181-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | archive: abbreviate substituted commit ids againJonathan Nieder2010-07-271-1/+1
* | | | | | | | Merge branch 'jh/use-test-must-fail'Junio C Hamano2010-08-1811-26/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Convert "! git" to "test_must_fail git"Jared Hance2010-07-2011-26/+26
* | | | | | | | | Merge branch 'jh/clean-exclude'Junio C Hamano2010-08-181-0/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add test for git clean -e.Jared Hance2010-07-201-0/+16
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jn/rebase-rename-am'Junio C Hamano2010-08-183-199/+343
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | rebase: protect against diff.renames configurationJunio C Hamano2010-07-231-1/+23
| * | | | | | | | t3400 (rebase): whitespace cleanupJonathan Nieder2010-07-231-90/+92
| * | | | | | | | Teach "apply --index-info" to handle rename patchesJunio C Hamano2010-07-231-0/+46
| * | | | | | | | t4150 (am): futureproof against failing testsJonathan Nieder2010-07-231-1/+47
| * | | | | | | | t4150 (am): style fixJonathan Nieder2010-07-232-108/+136
| | |_|/ / / / / | |/| | | | | |