summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2010-09-01Prepare for 1.7.2.3Libravatar Junio C Hamano2-1/+47
2010-09-01Merge branch 'gp/pack-refs-remove-empty-dirs' into maintLibravatar Junio C Hamano2-0/+38
2010-09-01Merge branch 'sg/rerere-gc-old-still-used' into maintLibravatar Junio C Hamano4-11/+41
2010-09-01Merge branch 'np/maint-huge-delta-generation' into maintLibravatar Junio C Hamano1-1/+8
2010-09-01Merge branch 'dj/fetch-tagopt' into maintLibravatar Junio C Hamano4-7/+56
2010-09-01Merge branch 'da/fix-submodule-sync-superproject-config' into maintLibravatar Junio C Hamano2-1/+5
2010-09-01Merge branch 'en/rebase-against-rebase-fix' into maintLibravatar Junio C Hamano2-0/+71
2010-09-01install-webdoc: filter timestamp-only changes correctlyLibravatar Junio C Hamano1-1/+1
2010-09-01builtin.h: Move two functions definitions to help.h.Libravatar Thiago Farina3-11/+13
2010-08-31Merge branch 'np/maint-huge-delta-generation'Libravatar Junio C Hamano1-1/+8
2010-08-31Merge branch 'da/fix-submodule-sync-superproject-config'Libravatar Junio C Hamano2-1/+5
2010-08-31Merge branch 'jn/cherry-revert-message-clean-up'Libravatar Junio C Hamano6-84/+152
2010-08-31Merge branch 'cb/binary-patch-id'Libravatar Junio C Hamano1-0/+7
2010-08-31Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'Libravatar Junio C Hamano1-1/+1
2010-08-31Merge branch 'dj/fetch-tagopt'Libravatar Junio C Hamano4-7/+56
2010-08-31Merge branch 'en/d-f-conflict-fix'Libravatar Junio C Hamano8-24/+276
2010-08-31Merge branch 'jn/svn-fe'Libravatar Junio C Hamano31-13/+2108
2010-08-31Merge branch 'tr/maint-no-unquote-plus'Libravatar Junio C Hamano2-7/+14
2010-08-31Merge branch 'jn/paginate-fix'Libravatar Junio C Hamano14-47/+120
2010-08-31Merge branch 'jn/maint-setup-fix'Libravatar Junio C Hamano4-282/+581
2010-08-31Merge branch 'en/fast-export-fix'Libravatar Junio C Hamano3-1/+30
2010-08-31Merge branch 'hv/autosquash-config'Libravatar Junio C Hamano4-8/+47
2010-08-31Merge branch 'sg/rerere-gc-old-still-used'Libravatar Junio C Hamano4-11/+41
2010-08-31tests: factor HOME=$(pwd) in test-lib.shLibravatar Matthieu Moy5-13/+3
2010-08-31test-lib: use subshell instead of cd $new && .. && cd $oldLibravatar Ævar Arnfjörð Bjarmason1-6/+6
2010-08-31tests: simplify "missing PREREQ" messageLibravatar Jonathan Nieder1-1/+7
2010-08-31t/t0000-basic.sh: Run the passing TODO test inside its own test-libLibravatar Ævar Arnfjörð Bjarmason1-0/+31
2010-08-31test-lib: Allow overriding of TEST_DIRECTORYLibravatar Ævar Arnfjörð Bjarmason1-1/+7
2010-08-31test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../Libravatar Ævar Arnfjörð Bjarmason1-14/+15
2010-08-31test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../Libravatar Ævar Arnfjörð Bjarmason1-8/+8
2010-08-31test: Introduce $GIT_BUILD_DIRLibravatar Thomas Rast1-0/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 21:03:53 +0000