Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ns/am-abort' | Junio C Hamano | 2008-07-20 | 1 | -0/+56 |
|\ | |||||
| * | git am --abort | Nanako Shiraishi | 2008-07-19 | 1 | -0/+56 |
* | | Merge branch 'jc/add-addremove' | Junio C Hamano | 2008-07-20 | 1 | -0/+44 |
|\ \ | |||||
| * | | git-add --all: tests | Junio C Hamano | 2008-07-19 | 1 | -0/+44 |
* | | | "needs update" considered harmful | Junio C Hamano | 2008-07-20 | 1 | -1/+1 |
* | | | Merge branch 'maint' | Junio C Hamano | 2008-07-20 | 1 | -0/+89 |
|\ \ \ | |||||
| * | | | refresh-index: fix bitmask assignment | Junio C Hamano | 2008-07-20 | 1 | -0/+89 |
* | | | | builtin-merge.c: Fix option parsing | Michele Ballabio | 2008-07-20 | 1 | -1/+1 |
* | | | | cvsserver: Add testsuite for packed refs | Lars Noschinski | 2008-07-20 | 1 | -0/+7 |
| |/ / |/| | | |||||
* | | | Merge branch 'maint' | Junio C Hamano | 2008-07-19 | 1 | -0/+12 |
|\ \ \ | |/ / | |||||
| * | | builtin-rm: fix index lock file path | Olivier Marin | 2008-07-19 | 1 | -0/+12 |
* | | | Support gitlinks in fast-import. | Alexander Gavrilov | 2008-07-19 | 2 | -0/+194 |
* | | | testsuite for cvs co -c | Fabian Emmes | 2008-07-19 | 1 | -0/+11 |
* | | | Testsuite: Unset CVS_SERVER | Fabian Emmes | 2008-07-19 | 1 | -0/+1 |
* | | | t9001 (send-email): Do not use hardcoded /bin/sh in test | Junio C Hamano | 2008-07-19 | 1 | -4/+4 |
* | | | Merge branch 'mv/dashless' | Junio C Hamano | 2008-07-16 | 2 | -4/+4 |
|\ \ \ | |||||
| * | | | t1007-hash-object.sh: use quotes for the test description | Miklos Vajna | 2008-07-11 | 1 | -1/+1 |
| * | | | t0001-init.sh: change confusing directory name | Miklos Vajna | 2008-07-11 | 1 | -3/+3 |
* | | | | Merge branch 'sb/dashless' | Junio C Hamano | 2008-07-16 | 59 | -234/+248 |
|\ \ \ \ | |||||
| * | | | | t/: Use "test_must_fail git" instead of "! git" | Stephan Beyer | 2008-07-13 | 58 | -233/+247 |
| * | | | | t/test-lib.sh: exit with small negagive int is ok with test_must_fail | Stephan Beyer | 2008-07-13 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'maint' | Junio C Hamano | 2008-07-16 | 1 | -31/+7 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'ls/maint-mailinfo-patch-label' into maint | Junio C Hamano | 2008-07-16 | 6 | -1/+101 |
| |\ \ \ | |||||
| * | | | | t7600-merge: Use test_expect_failure to test option parsing | Johannes Sixt | 2008-07-16 | 1 | -30/+6 |
* | | | | | t/Makefile: use specified shell when running aggregation script | SungHyun Nam | 2008-07-16 | 1 | -1/+1 |
* | | | | | t/aggregate-results: whitespace fix | Junio C Hamano | 2008-07-16 | 1 | -5/+5 |
* | | | | | t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory" | Eric Wong | 2008-07-16 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'mv/merge-in-c' | Junio C Hamano | 2008-07-15 | 7 | -0/+371 |
|\ \ \ \ | |||||
| * | | | | reduce_heads(): protect from duplicate input | Junio C Hamano | 2008-07-14 | 1 | -0/+22 |
| * | | | | reduce_heads(): thinkofix | Sverre Hvammen Johansen | 2008-07-13 | 1 | -0/+11 |
| * | | | | Add a new test for git-merge-resolve | Miklos Vajna | 2008-07-13 | 1 | -0/+46 |
| * | | | | t6021: add a new test for git-merge-resolve | Miklos Vajna | 2008-07-13 | 1 | -0/+4 |
| * | | | | Teach merge.log to "git-merge" again | Junio C Hamano | 2008-07-10 | 1 | -0/+7 |
| * | | | | Build in merge | Miklos Vajna | 2008-07-07 | 1 | -1/+1 |
| * | | | | Fix t7601-merge-pull-config.sh on AIX | Miklos Vajna | 2008-07-06 | 1 | -7/+7 |
| * | | | | Add new test case to ensure git-merge prepends the custom merge message | Miklos Vajna | 2008-07-06 | 1 | -0/+37 |
| * | | | | Add new test case to ensure git-merge reduces octopus parents when possible | Miklos Vajna | 2008-06-30 | 1 | -0/+63 |
| * | | | | Add new test to ensure git-merge handles more than 25 refs. | Miklos Vajna | 2008-06-30 | 1 | -0/+52 |
| * | | | | Add new test to ensure git-merge handles pull.twohead and pull.octopus | Miklos Vajna | 2008-06-30 | 1 | -0/+129 |
* | | | | | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" | Johannes Schindelin | 2008-07-15 | 5 | -20/+20 |
* | | | | | t9600: allow testing with cvsps 2.2, including beta versions | Pavel Roskin | 2008-07-15 | 1 | -2/+2 |
* | | | | | Merge branch 'js/merge-rr' | Junio C Hamano | 2008-07-14 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Move MERGE_RR from .git/rr-cache/ into .git/ | Johannes Schindelin | 2008-07-13 | 1 | -3/+3 |
* | | | | | | Merge branch 'ls/maint-mailinfo-patch-label' | Junio C Hamano | 2008-07-14 | 6 | -1/+101 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | git-mailinfo: Fix getting the subject from the in-body [PATCH] line | Lukas Sandström | 2008-07-13 | 6 | -1/+101 |
* | | | | | | Merge branch 'om/rerere-careful' | Junio C Hamano | 2008-07-14 | 1 | -6/+20 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | builtin-rerere: more carefully find conflict markers | Olivier Marin | 2008-07-10 | 1 | -6/+20 |
| | |_|_|/ | |/| | | | |||||
* | | | | | restore legacy behavior for read_sha1_file() | Nicolas Pitre | 2008-07-14 | 1 | -0/+60 |
* | | | | | git-submodule - make "submodule add" more strict, and document it | Mark Levedahl | 2008-07-14 | 1 | -1/+1 |
* | | | | | git-svn: find-rev and rebase for SVN::Mirror repositories | João Abecasis | 2008-07-14 | 1 | -0/+9 |