summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-08-21Merge branch 'po/userdiff-csharp'Libravatar Junio C Hamano3-1/+19
2010-08-21Merge branch 'ab/perl-install'Libravatar Junio C Hamano1-1/+1
2010-08-21reset: suggest what to do upon "git reset --mixed <paths>"Libravatar Ævar Arnfjörð Bjarmason1-1/+1
2010-08-21Merge branch 'maint'Libravatar Junio C Hamano2-3/+3
2010-08-21t7403: add missing &&'sLibravatar Jens Lehmann1-2/+2
2010-08-21Tell ignore file about generate files in /gitweb/staticLibravatar Mark Rada1-1/+1
2010-08-20Merge branch 'maint'Libravatar Junio C Hamano1-1/+2
2010-08-20Merge branch 'jc/maint-follow-rename-fix' into maintLibravatar Junio C Hamano5-18/+41
2010-08-20Merge branch 'jn/maint-plug-leak' into maintLibravatar Junio C Hamano3-3/+13
2010-08-20Merge branch 'jn/fix-abbrev' into maintLibravatar Junio C Hamano5-4/+3
2010-08-20Merge branch 'vs/doc-spell' into maintLibravatar Junio C Hamano9-16/+18
2010-08-20Merge branch 'jn/rebase-rename-am' into maintLibravatar Junio C Hamano5-202/+345
2010-08-20Merge branch 'jn/doc-pull' into maintLibravatar Junio C Hamano1-11/+54
2010-08-20Merge branch 'bc/use-more-hardlinks-in-install' into maintLibravatar Junio C Hamano1-3/+12
2010-08-20Merge branch 'tr/rfc-reset-doc' into maintLibravatar Junio C Hamano1-169/+178
2010-08-20builtin/checkout: Fix message when switching to an existing branchLibravatar Ramkumar Ramachandra1-1/+4
2010-08-20xmalloc: include size in the failure messageLibravatar Matthieu Moy1-1/+2
2010-08-20merge-recursive: Avoid excessive output for and reprocessing of renamesLibravatar Elijah Newren1-6/+2
2010-08-19Merge branch 'maint' to sync with 1.7.2.2Libravatar Junio C Hamano3-2/+25
2010-08-19Git 1.7.2.2Libravatar Junio C Hamano4-3/+26
2010-08-19Merge branch 'tr/xsize-bits' into maintLibravatar Junio C Hamano1-0/+2
2010-08-19Merge branch 'jc/sha1-name-find-fix' into maintLibravatar Junio C Hamano1-10/+11
2010-08-19t/t9010-svn-fe.sh: add an +x bit to this testLibravatar Ævar Arnfjörð Bjarmason1-0/+0
2010-08-19t9155: fix compatibility with older SVNLibravatar Eric Wong1-1/+1
2010-08-18Merge branch 'sp/fix-smart-http-deadlock-on-error' into maintLibravatar Junio C Hamano1-2/+3
2010-08-18submodule sync: Update "submodule.<name>.url"Libravatar David Aguilar2-1/+5
2010-08-18tests: fix syntax error in "Use advise() for hints" testLibravatar Ævar Arnfjörð Bjarmason1-5/+5
2010-08-18Merge branch 'jc/maint-follow-rename-fix'Libravatar Junio C Hamano5-18/+41
2010-08-18Merge branch 'tf/string-list-init'Libravatar Junio C Hamano16-31/+36
2010-08-18Merge branch 'cc/find-commit-subject'Libravatar Junio C Hamano7-49/+62
2010-08-18Merge branch 'jn/maint-plug-leak'Libravatar Junio C Hamano3-3/+13
2010-08-18Merge branch 'jl/submodule-ignore-diff'Libravatar Junio C Hamano17-21/+526
2010-08-18Merge branch 'ml/rebase-x-strategy'Libravatar Junio C Hamano3-1/+39
2010-08-18Merge branch 'jn/fix-abbrev'Libravatar Junio C Hamano5-4/+3
2010-08-18Merge branch 'vs/doc-spell'Libravatar Junio C Hamano9-16/+18
2010-08-18Merge branch 'jh/use-test-must-fail'Libravatar Junio C Hamano11-26/+26
2010-08-18Merge branch 'jh/clean-exclude'Libravatar Junio C Hamano3-2/+39
2010-08-18Merge branch 'kf/post-receive-sample-hook'Libravatar Junio C Hamano1-2/+32
2010-08-18Merge branch 'ab/report-corrupt-object-with-type'Libravatar Junio C Hamano1-2/+11
2010-08-18Merge branch 'jn/rebase-rename-am'Libravatar Junio C Hamano5-202/+345
2010-08-18Merge branch 'jn/fast-import-subtree'Libravatar Junio C Hamano3-11/+75
2010-08-18Merge branch 'ar/string-list-foreach'Libravatar Junio C Hamano5-104/+67
2010-08-18Merge branch 'jh/graph-next-line'Libravatar Junio C Hamano2-23/+55
2010-08-18Merge branch 'tr/xsize-bits'Libravatar Junio C Hamano1-0/+2
2010-08-18merge-recursive: Fix multiple file rename across D/F conflictLibravatar Elijah Newren2-1/+2
2010-08-18t6031: Add a testcase covering multiple renames across a D/F conflictLibravatar Elijah Newren1-0/+31
2010-08-18merge-recursive: Fix typoLibravatar Elijah Newren1-1/+1
2010-08-18Merge branch 'tc/checkout-B'Libravatar Junio C Hamano4-9/+218
2010-08-17mergetool: Skip autoresolved pathsLibravatar David Aguilar2-17/+57
2010-08-16hash binary sha1 into patch idLibravatar Clemens Buchacher1-0/+7