Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'da/fix-submodule-sync-superproject-config' | Junio C Hamano | 2010-09-01 | 2 | -1/+5 |
|\ | |||||
| * | submodule sync: Update "submodule.<name>.url" | David Aguilar | 2010-08-18 | 2 | -1/+5 |
* | | Merge branch 'jn/cherry-revert-message-clean-up' | Junio C Hamano | 2010-09-01 | 6 | -84/+152 |
|\ \ | |||||
| * | | tests: fix syntax error in "Use advise() for hints" test | Ævar Arnfjörð Bjarmason | 2010-08-18 | 1 | -5/+5 |
| * | | cherry-pick/revert: Use advise() for hints | Jonathan Nieder | 2010-08-16 | 3 | -26/+34 |
| * | | cherry-pick/revert: Use error() for failure message | Jonathan Nieder | 2010-08-16 | 1 | -2/+5 |
| * | | Introduce advise() to print hints | Jonathan Nieder | 2010-08-16 | 1 | -0/+9 |
| * | | Eliminate “Finished cherry-pick/revert” message | Jonathan Nieder | 2010-08-16 | 4 | -21/+30 |
| * | | t3508: add check_head_differs_from() helper function and use it | Christian Couder | 2010-07-24 | 1 | -5/+17 |
| * | | revert: improve success message by adding abbreviated commit sha1 | Christian Couder | 2010-07-17 | 2 | -10/+11 |
| * | | revert: don't print "Finished one cherry-pick." if commit failed | Christian Couder | 2010-07-17 | 1 | -12/+5 |
| * | | revert: refactor commit code into a new run_git_commit() function | Christian Couder | 2010-07-17 | 1 | -25/+27 |
| * | | revert: report success when using option --strategy | Christian Couder | 2010-07-17 | 2 | -23/+54 |
* | | | Merge branch 'cb/binary-patch-id' | Junio C Hamano | 2010-09-01 | 1 | -0/+7 |
|\ \ \ | |||||
| * | | | hash binary sha1 into patch id | Clemens Buchacher | 2010-08-17 | 1 | -0/+7 |
| | |/ | |/| | |||||
* | | | Merge branch 'ab/maint-reset-mixed-w-pathspec-advice' | Junio C Hamano | 2010-09-01 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | reset: suggest what to do upon "git reset --mixed <paths>" | Ævar Arnfjörð Bjarmason | 2010-08-22 | 1 | -1/+1 |
* | | | | Merge branch 'dj/fetch-tagopt' | Junio C Hamano | 2010-09-01 | 4 | -7/+56 |
|\ \ \ \ | |||||
| * | | | | fetch: allow command line --tags to override config | Daniel Johnson | 2010-08-15 | 4 | -7/+56 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'en/d-f-conflict-fix' | Junio C Hamano | 2010-09-01 | 8 | -24/+276 |
|\ \ \ \ | |||||
| * | | | | merge-recursive: Avoid excessive output for and reprocessing of renames | Elijah Newren | 2010-08-20 | 1 | -6/+2 |
| * | | | | merge-recursive: Fix multiple file rename across D/F conflict | Elijah Newren | 2010-08-18 | 2 | -1/+2 |
| * | | | | t6031: Add a testcase covering multiple renames across a D/F conflict | Elijah Newren | 2010-08-18 | 1 | -0/+31 |
| * | | | | merge-recursive: Fix typo | Elijah Newren | 2010-08-18 | 1 | -1/+1 |
| * | | | | Mark tests that use symlinks as needing SYMLINKS prerequisite | Elijah Newren | 2010-08-13 | 2 | -3/+3 |
| * | | | | t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test | Ævar Arnfjörð Bjarmason | 2010-07-27 | 1 | -1/+1 |
| * | | | | fast-import: Improve robustness when D->F changes provided in wrong order | Elijah Newren | 2010-07-10 | 1 | -0/+8 |
| * | | | | fast-export: Fix output order of D/F changes | Elijah Newren | 2010-07-10 | 2 | -1/+30 |
| * | | | | merge_recursive: Fix renames across paths below D/F conflicts | Elijah Newren | 2010-07-10 | 3 | -4/+15 |
| * | | | | merge-recursive: Fix D/F conflicts | Elijah Newren | 2010-07-10 | 2 | -19/+80 |
| * | | | | Add a rename + D/F conflict testcase | Alexander Gladysh | 2010-07-10 | 1 | -0/+35 |
| * | | | | Add additional testcases for D/F conflicts | Elijah Newren | 2010-07-10 | 2 | -4/+84 |
* | | | | | Merge branch 'jn/svn-fe' | Junio C Hamano | 2010-09-01 | 31 | -13/+2108 |
|\ \ \ \ \ | |||||
| * | | | | | t/t9010-svn-fe.sh: add an +x bit to this test | Ævar Arnfjörð Bjarmason | 2010-08-19 | 1 | -0/+0 |
| * | | | | | t9010 (svn-fe): avoid symlinks in test | Jonathan Nieder | 2010-08-15 | 1 | -1/+1 |
| * | | | | | t9010 (svn-fe): use Unix-style path in URI | Jonathan Nieder | 2010-08-15 | 1 | -1/+1 |
| * | | | | | vcs-svn: Avoid %z in format string | Jonathan Nieder | 2010-08-15 | 1 | -2/+3 |
| * | | | | | vcs-svn: Rename dirent pool to build on Windows | Jonathan Nieder | 2010-08-15 | 1 | -73/+73 |
| * | | | | | compat: add strtok_r() | Jonathan Nieder | 2010-08-15 | 5 | -0/+81 |
| * | | | | | treap: style fix | Jonathan Nieder | 2010-08-15 | 1 | -15/+15 |
| * | | | | | vcs-svn: remove build artifacts on "make clean" | Jonathan Nieder | 2010-08-15 | 1 | -2/+2 |
| * | | | | | svn-fe manual: Clarify warning about deltas in dump files | Jonathan Nieder | 2010-08-15 | 1 | -1/+4 |
| * | | | | | Update svn-fe manual | Jonathan Nieder | 2010-08-15 | 1 | -8/+6 |
| * | | | | | SVN dump parser | David Barr | 2010-08-15 | 8 | -2/+372 |
| * | | | | | Infrastructure to write revisions in fast-export format | David Barr | 2010-08-15 | 5 | -2/+443 |
| * | | | | | Add stream helper library | David Barr | 2010-08-15 | 7 | -2/+274 |
| * | | | | | Add string-specific memory pool | David Barr | 2010-08-15 | 7 | -3/+210 |
| * | | | | | Add treap implementation | Jason Evans | 2010-08-15 | 7 | -1/+432 |
| * | | | | | Add memory pool library | David Barr | 2010-08-15 | 5 | -1/+260 |
| * | | | | | Introduce vcs-svn lib | Jonathan Nieder | 2010-08-15 | 2 | -1/+33 |