summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-09-12Start merging the sixth batch for 1.8.0Libravatar Junio C Hamano1-33/+18
2012-09-12Merge branch 'maint'Libravatar Junio C Hamano1-0/+26
2012-09-12Merge branch 'jc/maint-checkout-fileglob-doc'Libravatar Junio C Hamano2-1/+30
2012-09-12Merge branch 'sb/send-email-reconfirm-fix'Libravatar Junio C Hamano1-2/+4
2012-09-12Merge branch 'nd/maint-remote-remove'Libravatar Junio C Hamano5-9/+10
2012-09-12Merge branch 'nd/log-n-doc'Libravatar Junio C Hamano2-5/+4
2012-09-12Merge branch 'kd/cvsimport-avoid-invalid-tag'Libravatar Junio C Hamano1-3/+30
2012-09-12Merge branch 'js/compat-itimer'Libravatar Junio C Hamano2-0/+23
2012-09-12Merge branch 'js/compat-mkdir'Libravatar Junio C Hamano1-0/+6
2012-09-12Further merging in preparation for 1.7.12.1Libravatar Junio C Hamano1-0/+26
2012-09-12Merge branch 'maint-1.7.11' into maintLibravatar Junio C Hamano19-162/+321
2012-09-12Merge branch 'jc/apply-binary-p0' into maint-1.7.11Libravatar Junio C Hamano2-46/+76
2012-09-12Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Libravatar Junio C Hamano5-4/+56
2012-09-12Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1....Libravatar Junio C Hamano1-3/+3
2012-09-12Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11Libravatar Junio C Hamano9-106/+171
2012-09-12Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11Libravatar Junio C Hamano2-1/+13
2012-09-12fetch-pack: eliminate spurious error messagesLibravatar Michael Haggerty2-7/+7
2012-09-12cmd_fetch_pack(): simplify computation of return valueLibravatar Michael Haggerty1-11/+10
2012-09-12fetch-pack: report missing refs even if no existing refs were receivedLibravatar Michael Haggerty2-2/+2
2012-09-12cmd_fetch_pack(): return early if finish_connect() failsLibravatar Michael Haggerty1-3/+3
2012-09-12filter_refs(): simplify logicLibravatar Michael Haggerty1-19/+18
2012-09-12filter_refs(): build refs list as we goLibravatar Michael Haggerty1-27/+4
2012-09-12filter_refs(): delete matched refs from sought listLibravatar Michael Haggerty3-15/+25
2012-09-12fetch_pack(): update sought->nr to reflect number of unique entriesLibravatar Michael Haggerty2-15/+2
2012-09-12filter_refs(): do not check the same sought_pos twiceLibravatar Michael Haggerty1-1/+1
2012-09-12Change fetch_pack() and friends to take string_list argumentsLibravatar Michael Haggerty3-60/+51
2012-09-12fetch_pack(): reindent function decl and defnLibravatar Michael Haggerty2-10/+10
2012-09-12Rename static function fetch_pack() to http_fetch_pack()Libravatar Michael Haggerty1-2/+2
2012-09-12t5500: add tests of fetch-pack --all --depth=N $URL $REFLibravatar Michael Haggerty1-0/+15
2012-09-12t5500: add tests of error output for missing refsLibravatar Michael Haggerty1-0/+30
2012-09-12api-string-list.txt: initialize the string_list the easy wayLibravatar Michael Haggerty1-2/+1
2012-09-12string_list: add a function string_list_longest_prefix()Libravatar Michael Haggerty5-0/+86
2012-09-12string_list: add a new function, string_list_remove_duplicates()Libravatar Michael Haggerty5-0/+60
2012-09-12string_list: add a new function, filter_string_list()Libravatar Michael Haggerty5-0/+96
2012-09-12string_list: add two new functions for splitting stringsLibravatar Michael Haggerty7-1/+213
2012-09-12string_list: add function string_list_append_nodup()Libravatar Michael Haggerty3-8/+47
2012-09-12Merge git://ozlabs.org/~paulus/gitkLibravatar Junio C Hamano1-0/+5
2012-09-12Merge branch 'da/gitk-reload-tag-contents'Libravatar Junio C Hamano1-8/+9
2012-09-12Merge branch 'da/gitk-reload-tag-contents' of git://github.com/gitster/gitLibravatar Paul Mackerras1-6/+7
2012-09-12ll-merge: warn about inability to merge binary files only when we can'tLibravatar Junio C Hamano1-3/+4
2012-09-11blame: allow "blame file" in the middle of a conflicted mergeLibravatar Junio C Hamano2-25/+70
2012-09-11checkout: reorder option handlingLibravatar Nguyễn Thái Ngọc Duy1-77/+112
2012-09-11Second half of the fifth batch for 1.8.0Libravatar Junio C Hamano1-45/+17
2012-09-11Merge branch 'rj/test-regex'Libravatar Junio C Hamano4-0/+27
2012-09-11Merge branch 'jk/argv-array'Libravatar Junio C Hamano6-39/+58
2012-09-11Merge branch 'jc/merge-bases'Libravatar Junio C Hamano11-112/+184
2012-09-11Merge branch 'nd/i18n-index-pack'Libravatar Junio C Hamano1-10/+11
2012-09-11Merge branch 'jc/maint-ident-missing-human-name'Libravatar Junio C Hamano2-3/+20
2012-09-11Sync with maintLibravatar Junio C Hamano3-34/+70
2012-09-11Further merging down for 1.7.12.1Libravatar Junio C Hamano1-0/+13