summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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 branch 'tc/checkout-B'Libravatar Junio C Hamano4-9/+218
2010-08-17mergetool: Skip autoresolved pathsLibravatar David Aguilar2-17/+57
2010-08-16Userdiff patterns for C#Libravatar Petr Onderka3-1/+19
2010-08-15log: test for regression introduced in v1.7.2-rc0~103^2~2Libravatar Ævar Arnfjörð Bjarmason1-1/+13
2010-08-15git-svn: fix fetch with deleted tagLibravatar David D. Kilzer3-2/+99
2010-08-15git-svn: fix regex to remove "tail" from svn tagsLibravatar David D. Kilzer1-1/+1
2010-08-13git-rebase--interactive.sh: use printf instead of echo to print commit messageLibravatar Brandon Casey1-2/+2
2010-08-13git-rebase--interactive.sh: rework skip_unnecessary_picksLibravatar Brandon Casey1-9/+14
2010-08-13diff --follow: do call diffcore_std() as necessaryLibravatar Junio C Hamano4-16/+27
2010-08-13diff --follow: do not waste cycles while recursingLibravatar Junio C Hamano1-1/+1
2010-08-12perl/Makefile: Unset INSTALL_BASE when making perl.makLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2010-08-12pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesLibravatar Elijah Newren2-2/+11
2010-08-12t5520-pull: Add testcases showing spurious conflicts from git pull --rebaseLibravatar Elijah Newren1-0/+62
2010-08-12Merge branch 'jc/sha1-name-find-fix'Libravatar Junio C Hamano1-10/+11
2010-08-12Merge branch 'jn/doc-pull'Libravatar Junio C Hamano1-11/+54
2010-08-12Merge branch 'jn/maint-gitweb-dynconf'Libravatar Junio C Hamano1-4/+4
2010-08-12Merge branch 'bc/use-more-hardlinks-in-install'Libravatar Junio C Hamano1-3/+12
2010-08-12Merge branch 'tr/rfc-reset-doc'Libravatar Junio C Hamano1-169/+178
2010-08-12Merge branch 'jn/parse-date-basic'Libravatar Junio C Hamano2-8/+7
2010-08-12Merge branch 'sp/fix-smart-http-deadlock-on-error'Libravatar Junio C Hamano1-2/+3
2010-08-12Merge branch 'maint'Libravatar Junio C Hamano8-13/+21
2010-08-12push: mention "git pull" in error message for non-fast forwardsLibravatar Matthieu Moy1-2/+2
2010-08-12Standardize do { ... } while (0) styleLibravatar Jonathan Nieder4-10/+10
2010-08-12t/t7003: replace \t with literal tab in sed expressionLibravatar Brandon Casey1-1/+1
2010-08-12index-pack: Don't follow replace refs.Libravatar Nelson Elhage2-0/+8
2010-08-11Allow HTTP user agent string to be modified.Libravatar Spencer E. Olson3-2/+18
2010-08-11Merge branch 'maint'Libravatar Junio C Hamano6-7/+130
2010-08-11post-receive-email: remove spurious commas in email subjectLibravatar Matthieu Moy1-1/+1
2010-08-11fast-import: export correctly marks larger than 2^20-1Libravatar Raja R Harinath2-1/+58
2010-08-11t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATHLibravatar Ævar Arnfjörð Bjarmason1-3/+2
2010-08-11t7609: test merge and checkout error messagesLibravatar Diane Gasselin1-0/+125
2010-08-11unpack_trees: group error messages by typeLibravatar Matthieu Moy11-17/+123
2010-08-11merge-recursive: distinguish "removed" and "overwritten" messagesLibravatar Matthieu Moy3-32/+51
2010-08-11merge-recursive: porcelain messages for checkoutLibravatar Diane Gasselin5-16/+31
2010-08-11Turn unpack_trees_options.msgs into an array + enumLibravatar Matthieu Moy6-52/+46