summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2010-08-31tests: make test_might_fail fail on missing commandsLibravatar Jonathan Nieder1-0/+3
2010-08-31tests: make test_might_fail more verboseLibravatar Jonathan Nieder1-1/+6
2010-08-31notes: Don't create (empty) commit when removing non-existing notesLibravatar Johan Herland4-9/+30
2010-08-31Extend documentation of core.askpass and GIT_ASKPASS.Libravatar Knut Franke2-2/+12
2010-08-31Allow core.askpass to override SSH_ASKPASS.Libravatar Knut Franke2-4/+2
2010-08-31Add a new option 'core.askpass'.Libravatar Anselm Kruis5-1/+14
2010-08-31tests: make test_must_fail fail on missing commandsLibravatar Jeff King1-0/+3
2010-08-31tests: make test_must_fail more verboseLibravatar Jeff King1-1/+9
2010-08-31gitweb: Don't die_error in git_tag after already printing headersLibravatar Anders Kaseorg1-3/+3
2010-08-31t3903: fix broken test_must_fail callsLibravatar Jon Seymour1-18/+18
2010-08-31t1503: fix broken test_must_fail callsLibravatar Jon Seymour1-2/+2
2010-08-30checkout: Use submodule.*.ignore settings from .git/config and .gitmodulesLibravatar Jens Lehmann2-0/+21
2010-08-30checkout: Add test for diff.ignoreSubmodulesLibravatar Jens Lehmann2-1/+9
2010-08-29Merge branch 'maint'Libravatar Junio C Hamano1-5/+5
2010-08-29Merge branch 'maint-1.7.1' into maintLibravatar Junio C Hamano1-5/+5
2010-08-29object.h: Add OBJECT_ARRAY_INIT macro and make use of it.Libravatar Thiago Farina7-6/+8
2010-08-29t0003: add missing && at end of linesLibravatar Matthieu Moy1-5/+5
2010-08-27filter-branch: retire --remap-to-ancestorLibravatar Csaba Henk3-14/+40
2010-08-27bundle: detect if bundle file cannot be createdLibravatar Csaba Henk2-2/+11
2010-08-26Merge branch 'maint'Libravatar Junio C Hamano4-11/+10
2010-08-26for-each-ref: fix objectname:short bugLibravatar Jay Soffian1-1/+2
2010-08-26Fix compat/regex ANSIfication on MinGWLibravatar Johannes Sixt1-6/+5
2010-08-25tree-walk: Correct bitrotted comment about tree_entry()Libravatar Elijah Newren1-1/+4
2010-08-25builtin/fetch.c: ignore merge config when not fetching from branch's remoteLibravatar Brandon Casey2-2/+4
2010-08-25t/t5510: demonstrate failure to fetch when current branch has merge refLibravatar Brandon Casey1-0/+6
2010-08-25checkout: respect diff.ignoreSubmodules settingLibravatar Johannes Schindelin1-4/+12
2010-08-25Fix 'git log' early pager startup error caseLibravatar Linus Torvalds2-9/+4
2010-08-24Merge branch 'maint'Libravatar Junio C Hamano2-2/+2
2010-08-24rev-parse: tests git rev-parse --verify master@{n}, for various nLibravatar Jon Seymour2-0/+20
2010-08-24sha1_name.c: use warning in preference to fprintf(stderrLibravatar Jon Seymour1-5/+4
2010-08-24rev-parse: exit with non-zero status if ref@{n} is not valid.Libravatar Jon Seymour1-4/+5
2010-08-24parse-options: clarify PARSE_OPT_NOARG descriptionLibravatar Jonathan Nieder1-1/+1
2010-08-24t3302 (notes): Port to SolarisLibravatar Jonathan Nieder1-1/+1
2010-08-24t7606: Avoid using head as a file nameLibravatar Brian Gernhardt1-4/+4