summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2010-09-03Merge branch 'jn/apply-filename-with-sp'Junio C Hamano
2010-09-03Merge branch 'jn/merge-custom-no-trivial'Junio C Hamano
2010-09-03Merge branch 'jc/maint-doc-em-dash'Junio C Hamano
2010-09-03Merge branch 'mg/doc-bundle'Junio C Hamano
2010-09-03Merge branch 'jn/doc-backslash'Junio C Hamano
2010-09-03Merge branch 'jn/update-contrib-example-merge'Junio C Hamano
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano
2010-09-03Sync with 1.7.2.3Junio C Hamano
2010-09-03Git 1.7.2.3v1.7.2.3Junio C Hamano
2010-09-03builtin/merge_recursive.c: Add an usage string and make use of it.Thiago Farina
2010-09-03t7406 & t7407: add missing && at end of linesJens Lehmann
2010-09-03t7405: cd inside subshell instead of aroundJens Lehmann
2010-09-03t7609-merge-co-error-msgs: test non-fast forward case too.Matthieu Moy
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy
2010-09-01Prepare for 1.7.3Junio C Hamano
2010-09-01Merge branch 'maint'Junio C Hamano
2010-09-01Prepare for 1.7.2.3Junio C Hamano
2010-09-01Merge branch 'gp/pack-refs-remove-empty-dirs' into maintJunio C Hamano
2010-09-01Merge branch 'sg/rerere-gc-old-still-used' into maintJunio C Hamano
2010-09-01Merge branch 'np/maint-huge-delta-generation' into maintJunio C Hamano
2010-09-01Merge branch 'dj/fetch-tagopt' into maintJunio C Hamano
2010-09-01Merge branch 'da/fix-submodule-sync-superproject-config' into maintJunio C Hamano
2010-09-01Merge branch 'en/rebase-against-rebase-fix' into maintJunio C Hamano
2010-09-01install-webdoc: filter timestamp-only changes correctlyJunio C Hamano
2010-09-01builtin.h: Move two functions definitions to help.h.Thiago Farina
2010-08-31Merge branch 'np/maint-huge-delta-generation'Junio C Hamano
2010-08-31Merge branch 'da/fix-submodule-sync-superproject-config'Junio C Hamano
2010-08-31Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano
2010-08-31Merge branch 'cb/binary-patch-id'Junio C Hamano
2010-08-31Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'Junio C Hamano
2010-08-31Merge branch 'dj/fetch-tagopt'Junio C Hamano
2010-08-31Merge branch 'en/d-f-conflict-fix'Junio C Hamano
2010-08-31Merge branch 'jn/svn-fe'Junio C Hamano
2010-08-31Merge branch 'tr/maint-no-unquote-plus'Junio C Hamano
2010-08-31Merge branch 'jn/paginate-fix'Junio C Hamano
2010-08-31Merge branch 'jn/maint-setup-fix'Junio C Hamano
2010-08-31Merge branch 'en/fast-export-fix'Junio C Hamano
2010-08-31Merge branch 'hv/autosquash-config'Junio C Hamano
2010-08-31Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano
2010-08-31tests: factor HOME=$(pwd) in test-lib.shMatthieu Moy
2010-08-31test-lib: use subshell instead of cd $new && .. && cd $oldÆvar Arnfjörð Bjarmason
2010-08-31tests: simplify "missing PREREQ" messageJonathan Nieder
2010-08-31t/t0000-basic.sh: Run the passing TODO test inside its own test-libÆvar Arnfjörð Bjarmason
2010-08-31test-lib: Allow overriding of TEST_DIRECTORYÆvar Arnfjörð Bjarmason
2010-08-31test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../Ævar Arnfjörð Bjarmason
2010-08-31test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../Ævar Arnfjörð Bjarmason
2010-08-31test: Introduce $GIT_BUILD_DIRThomas Rast
2010-08-31tests: make test_might_fail fail on missing commandsJonathan Nieder