summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-09-08Merge branch 'jh/error-removing-missing-note'Libravatar Junio C Hamano4-9/+30
2010-09-08Merge branch 'kf/askpass-config'Libravatar Junio C Hamano7-5/+26
2010-09-08Merge branch 'bc/maint-fetch-url-only'Libravatar Junio C Hamano2-1/+9
2010-09-08Merge branch 'jk/maint-pass-c-config-in-env'Libravatar Junio C Hamano5-5/+83
2010-09-08Merge branch 'en/d-f-conflict-fix'Libravatar Junio C Hamano1-1/+9
2010-09-08fast-export: ensure that a renamed file is printed after all referencesLibravatar Johannes Sixt1-1/+9
2010-09-06Documentation: move RelNotes into a directory of their ownLibravatar Nicolas Pitre111-107/+107
2010-09-06Merge branch 'maint'Libravatar Junio C Hamano1-1/+3
2010-09-06revert: Fix trivial comment style issueLibravatar Elijah Newren1-1/+0
2010-09-06cache_tree_free: Fix small memory leakLibravatar Elijah Newren1-1/+3
2010-09-06Merge branch 'jh/clean-exclude'Libravatar Junio C Hamano1-1/+1
2010-09-06builtin/clean.c: Use STRING_LIST_INIT_NODUP.Libravatar Thiago Farina1-1/+1
2010-09-06Merge branch 'jl/maint-fix-test'Libravatar Junio C Hamano32-260/+256
2010-09-06Several tests: cd inside subshell instead of aroundLibravatar Jens Lehmann32-260/+256
2010-09-06t3404 & t7508: cd inside subshell instead of aroundLibravatar Jens Lehmann2-4/+4
2010-09-06Merge branch 'maint'Libravatar Junio C Hamano3-11/+11
2010-09-06Merge branch 'xx/trivial' into maintLibravatar Junio C Hamano3-11/+11
2010-09-05tag.c: whitespace breakages fixLibravatar Junio C Hamano1-9/+9
2010-09-05Fix whitespace issue in object.cLibravatar Jared Hance1-4/+4
2010-09-05t5505: add missing &&Libravatar Jens Lehmann1-1/+1
2010-09-04Merge branch 'jl/submodule-ignore-diff'Libravatar Junio C Hamano3-5/+42
2010-09-04Merge branch 'ab/test-2'Libravatar Junio C Hamano51-559/+968
2010-09-03Merge branch 'js/detached-stash'Libravatar Junio C Hamano3-83/+268
2010-09-03Merge branch 'js/maint-reflog-beyond-horizon'Libravatar Junio C Hamano3-9/+29
2010-09-03Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano7-64/+69
2010-09-03Merge branch 'nd/maint-fix-replace'Libravatar Junio C Hamano2-2/+2
2010-09-03parse_object: pass on the original sha1, not the replaced oneLibravatar Nguyễn Thái Ngọc Duy2-2/+2
2010-09-03RE: [PATCH] Avoid rename/add conflict when contents are identicalLibravatar Schalk, Ken2-0/+41
2010-09-03Merge branch 'ab/compat-regex'Libravatar Junio C Hamano10-5105/+11193
2010-09-03Merge branch 'nd/clone-depth-zero'Libravatar Junio C Hamano1-2/+5
2010-09-03Merge branch 'jn/maint-doc-user-manual-html-doctype'Libravatar Junio C Hamano2-2/+5
2010-09-03Merge branch 'cb/maint-mergetool-no-tty'Libravatar Junio C Hamano2-3/+7
2010-09-03Merge branch 'jn/apply-filename-with-sp'Libravatar Junio C Hamano21-41/+456
2010-09-03Merge branch 'jn/merge-custom-no-trivial'Libravatar Junio C Hamano2-26/+71
2010-09-03Merge branch 'jc/maint-doc-em-dash'Libravatar Junio C Hamano7-18/+19
2010-09-03Merge branch 'mg/doc-bundle'Libravatar Junio C Hamano1-33/+34
2010-09-03Merge branch 'jn/doc-backslash'Libravatar Junio C Hamano26-59/+64
2010-09-03Merge branch 'jn/update-contrib-example-merge'Libravatar Junio C Hamano9-562/+701
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano18-170/+785
2010-09-03Sync with 1.7.2.3Libravatar Junio C Hamano3-9/+6
2010-09-03Git 1.7.2.3Libravatar Junio C Hamano3-9/+3
2010-09-03builtin/merge_recursive.c: Add an usage string and make use of it.Libravatar Thiago Farina1-1/+4
2010-09-03t7406 & t7407: add missing && at end of linesLibravatar Jens Lehmann2-3/+3
2010-09-03t7405: cd inside subshell instead of aroundLibravatar Jens Lehmann1-11/+6
2010-09-03t7609-merge-co-error-msgs: test non-fast forward case too.Libravatar Matthieu Moy1-2/+10
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Libravatar Matthieu Moy4-9/+3
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterLibravatar Matthieu Moy5-5/+8
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itLibravatar Matthieu Moy6-54/+54
2010-09-01Prepare for 1.7.3Libravatar Junio C Hamano2-1/+74
2010-09-01Merge branch 'maint'Libravatar Junio C Hamano2-1/+47