summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/rebase-against-rebase-fix'Junio C Hamano2010-08-212-0/+71
|\
| * pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren2010-08-122-2/+11
| * 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-2113-81/+340
|\ \
| * | t7609: test merge and checkout error messagesDiane Gasselin2010-08-111-0/+125
| * | unpack_trees: group error messages by typeMatthieu Moy2010-08-1111-17/+123
| * | merge-recursive: distinguish "removed" and "overwritten" messagesMatthieu Moy2010-08-113-32/+51
| * | merge-recursive: porcelain messages for checkoutDiane Gasselin2010-08-115-16/+31
| * | Turn unpack_trees_options.msgs into an array + enumMatthieu Moy2010-08-116-52/+46
* | | Merge branch 'po/userdiff-csharp'Junio C Hamano2010-08-213-1/+19
|\ \ \
| * | | Userdiff patterns for C#Petr Onderka2010-08-163-1/+19
| |/ /
* | | Merge branch 'ab/perl-install'Junio C Hamano2010-08-211-1/+1
|\ \ \
| * | | perl/Makefile: Unset INSTALL_BASE when making perl.makÆvar Arnfjörð Bjarmason2010-08-121-1/+1
| |/ /
* | | Merge branch 'maint'Junio C Hamano2010-08-212-3/+3
|\ \ \
| * | | t7403: add missing &&'sJens Lehmann2010-08-211-2/+2
| * | | Tell ignore file about generate files in /gitweb/staticMark Rada2010-08-211-1/+1
* | | | Merge branch 'maint'Junio C Hamano2010-08-201-1/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'jc/maint-follow-rename-fix' into maintJunio C Hamano2010-08-205-18/+41
| |\ \ \
| * \ \ \ Merge branch 'jn/maint-plug-leak' into maintJunio C Hamano2010-08-203-3/+13
| |\ \ \ \
| * \ \ \ \ Merge branch 'jn/fix-abbrev' into maintJunio C Hamano2010-08-205-4/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'vs/doc-spell' into maintJunio C Hamano2010-08-209-16/+18
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jn/rebase-rename-am' into maintJunio C Hamano2010-08-205-202/+345
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jn/doc-pull' into maintJunio C Hamano2010-08-201-11/+54
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'bc/use-more-hardlinks-in-install' into maintJunio C Hamano2010-08-201-3/+12
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'tr/rfc-reset-doc' into maintJunio C Hamano2010-08-201-169/+178
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | xmalloc: include size in the failure messageMatthieu Moy2010-08-201-1/+2
* | | | | | | | | | | | builtin/checkout: Fix message when switching to an existing branchRamkumar Ramachandra2010-08-201-1/+4
* | | | | | | | | | | | Merge branch 'maint' to sync with 1.7.2.2Junio C Hamano2010-08-193-2/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Git 1.7.2.2v1.7.2.2Junio C Hamano2010-08-194-3/+26
| * | | | | | | | | | | Merge branch 'tr/xsize-bits' into maintJunio C Hamano2010-08-191-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/sha1-name-find-fix' into maintJunio C Hamano2010-08-191-10/+11
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/fix-smart-http-deadlock-on-error' into maintJunio C Hamano2010-08-181-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | t9155: fix compatibility with older SVNEric Wong2010-08-191-1/+1
* | | | | | | | | | | | | | | Merge branch 'jc/maint-follow-rename-fix'Junio C Hamano2010-08-185-18/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | log: test for regression introduced in v1.7.2-rc0~103^2~2Ævar Arnfjörð Bjarmason2010-08-151-1/+13
| * | | | | | | | | | | | | | diff --follow: do call diffcore_std() as necessaryJunio C Hamano2010-08-134-16/+27
| * | | | | | | | | | | | | | diff --follow: do not waste cycles while recursingJunio C Hamano2010-08-131-1/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'tf/string-list-init'Junio C Hamano2010-08-1816-31/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina2010-07-0516-31/+36
* | | | | | | | | | | | | | | Merge branch 'cc/find-commit-subject'Junio C Hamano2010-08-187-49/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | blame: use find_commit_subject() instead of custom codeChristian Couder2010-07-231-15/+7
| * | | | | | | | | | | | | | | merge-recursive: use find_commit_subject() instead of custom codeChristian Couder2010-07-231-10/+4
| * | | | | | | | | | | | | | | bisect: use find_commit_subject() instead of custom codeChristian Couder2010-07-231-8/+5
| * | | | | | | | | | | | | | | revert: rename variables related to subject in get_message()Christian Couder2010-07-231-5/+5
| * | | | | | | | | | | | | | | revert: refactor code to find commit subject in find_commit_subject()Christian Couder2010-07-233-12/+24
| * | | | | | | | | | | | | | | revert: fix off by one read when searching the end of a commit subjectChristian Couder2010-07-232-2/+20
* | | | | | | | | | | | | | | | Merge branch 'jn/maint-plug-leak'Junio C Hamano2010-08-183-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | write-tree: Avoid leak when index refers to an invalid objectJonathan Nieder2010-08-111-1/+3
| * | | | | | | | | | | | | | | read-tree: stop leaking tree objectsJonathan Nieder2010-08-111-1/+6
| * | | | | | | | | | | | | | | core: Stop leaking ondisk_cache_entrysJonathan Nieder2010-08-111-1/+4
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
View Lorry Controller Status