summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Merge branch 'sg/rerere-gc-old-still-used' into maintJunio C Hamano2010-09-014-11/+41
| |\ \ \ \
| * \ \ \ \ Merge branch 'np/maint-huge-delta-generation' into maintJunio C Hamano2010-09-011-1/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dj/fetch-tagopt' into maintJunio C Hamano2010-09-014-7/+56
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'da/fix-submodule-sync-superproject-config' into maintJunio C Hamano2010-09-012-1/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'en/rebase-against-rebase-fix' into maintJunio C Hamano2010-09-012-0/+71
| |\ \ \ \ \ \ \ \
* | | | | | | | | | install-webdoc: filter timestamp-only changes correctlyJunio C Hamano2010-09-011-1/+1
* | | | | | | | | | Merge branch 'np/maint-huge-delta-generation'Junio C Hamano2010-08-311-1/+8
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | fix >4GiB source delta assertion failureNicolas Pitre2010-08-211-1/+8
* | | | | | | | | | Merge branch 'da/fix-submodule-sync-superproject-config'Junio C Hamano2010-08-312-1/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | submodule sync: Update "submodule.<name>.url"David Aguilar2010-08-182-1/+5
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano2010-08-316-84/+152
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tests: fix syntax error in "Use advise() for hints" testÆvar Arnfjörð Bjarmason2010-08-181-5/+5
| * | | | | | | | | cherry-pick/revert: Use advise() for hintsJonathan Nieder2010-08-153-26/+34
| * | | | | | | | | cherry-pick/revert: Use error() for failure messageJonathan Nieder2010-08-151-2/+5
| * | | | | | | | | Introduce advise() to print hintsJonathan Nieder2010-08-151-0/+9
| * | | | | | | | | Eliminate “Finished cherry-pick/revert” messageJonathan Nieder2010-08-154-21/+30
| * | | | | | | | | t3508: add check_head_differs_from() helper function and use itChristian Couder2010-07-231-5/+17
| * | | | | | | | | revert: improve success message by adding abbreviated commit sha1Christian Couder2010-07-162-10/+11
| * | | | | | | | | revert: don't print "Finished one cherry-pick." if commit failedChristian Couder2010-07-161-12/+5
| * | | | | | | | | revert: refactor commit code into a new run_git_commit() functionChristian Couder2010-07-161-25/+27
| * | | | | | | | | revert: report success when using option --strategyChristian Couder2010-07-162-23/+54
* | | | | | | | | | Merge branch 'cb/binary-patch-id'Junio C Hamano2010-08-311-0/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | hash binary sha1 into patch idClemens Buchacher2010-08-161-0/+7
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'Junio C Hamano2010-08-311-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reset: suggest what to do upon "git reset --mixed <paths>"Ævar Arnfjörð Bjarmason2010-08-211-1/+1
* | | | | | | | | | | Merge branch 'dj/fetch-tagopt'Junio C Hamano2010-08-314-7/+56
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | fetch: allow command line --tags to override configDaniel Johnson2010-08-144-7/+56
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'en/d-f-conflict-fix'Junio C Hamano2010-08-318-24/+276
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge-recursive: Avoid excessive output for and reprocessing of renamesElijah Newren2010-08-201-6/+2
| * | | | | | | | | | merge-recursive: Fix multiple file rename across D/F conflictElijah Newren2010-08-182-1/+2
| * | | | | | | | | | t6031: Add a testcase covering multiple renames across a D/F conflictElijah Newren2010-08-181-0/+31
| * | | | | | | | | | merge-recursive: Fix typoElijah Newren2010-08-181-1/+1
| * | | | | | | | | | Mark tests that use symlinks as needing SYMLINKS prerequisiteElijah Newren2010-08-122-3/+3
| * | | | | | | | | | t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing testÆvar Arnfjörð Bjarmason2010-07-271-1/+1
| * | | | | | | | | | fast-import: Improve robustness when D->F changes provided in wrong orderElijah Newren2010-07-091-0/+8
| * | | | | | | | | | fast-export: Fix output order of D/F changesElijah Newren2010-07-092-1/+30
| * | | | | | | | | | merge_recursive: Fix renames across paths below D/F conflictsElijah Newren2010-07-093-4/+15
| * | | | | | | | | | merge-recursive: Fix D/F conflictsElijah Newren2010-07-092-19/+80
| * | | | | | | | | | Add a rename + D/F conflict testcaseAlexander Gladysh2010-07-091-0/+35
| * | | | | | | | | | Add additional testcases for D/F conflictsElijah Newren2010-07-092-4/+84
* | | | | | | | | | | Merge branch 'jn/svn-fe'Junio C Hamano2010-08-3131-13/+2108
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t/t9010-svn-fe.sh: add an +x bit to this testÆvar Arnfjörð Bjarmason2010-08-191-0/+0
| * | | | | | | | | | | t9010 (svn-fe): avoid symlinks in testJonathan Nieder2010-08-141-1/+1
| * | | | | | | | | | | t9010 (svn-fe): use Unix-style path in URIJonathan Nieder2010-08-141-1/+1
| * | | | | | | | | | | vcs-svn: Avoid %z in format stringJonathan Nieder2010-08-141-2/+3
| * | | | | | | | | | | vcs-svn: Rename dirent pool to build on WindowsJonathan Nieder2010-08-141-73/+73
| * | | | | | | | | | | compat: add strtok_r()Jonathan Nieder2010-08-145-0/+81
| * | | | | | | | | | | treap: style fixJonathan Nieder2010-08-141-15/+15
| * | | | | | | | | | | vcs-svn: remove build artifacts on "make clean"Jonathan Nieder2010-08-141-2/+2
| * | | | | | | | | | | svn-fe manual: Clarify warning about deltas in dump filesJonathan Nieder2010-08-141-1/+4
View Lorry Controller Status