summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kf/askpass-config'Junio C Hamano2010-09-087-5/+26
|\
| * Extend documentation of core.askpass and GIT_ASKPASS.Knut Franke2010-08-312-2/+12
| * Allow core.askpass to override SSH_ASKPASS.Knut Franke2010-08-312-4/+2
| * Add a new option 'core.askpass'.Anselm Kruis2010-08-315-1/+14
* | Merge branch 'bc/maint-fetch-url-only'Junio C Hamano2010-09-082-1/+9
|\ \
| * | builtin/fetch.c: ignore merge config when not fetching from branch's remoteBrandon Casey2010-08-252-2/+4
| * | t/t5510: demonstrate failure to fetch when current branch has merge refBrandon Casey2010-08-251-0/+6
* | | Merge branch 'jk/maint-pass-c-config-in-env'Junio C Hamano2010-09-085-5/+83
|\ \ \
| * | | do not pass "git -c foo=bar" params to transport helpersJonathan Nieder2010-08-243-1/+25
| * | | pass "git -c foo=bar" params through environmentJeff King2010-08-243-4/+58
| | |/ | |/|
* | | Merge branch 'en/d-f-conflict-fix'Junio C Hamano2010-09-081-1/+9
|\ \ \
| * | | fast-export: ensure that a renamed file is printed after all referencesJohannes Sixt2010-09-081-1/+9
* | | | Merge branch 'maint'Junio C Hamano2010-09-061-1/+3
|\ \ \ \
| * | | | revert: Fix trivial comment style issueElijah Newren2010-09-061-1/+0
| * | | | cache_tree_free: Fix small memory leakElijah Newren2010-09-061-1/+3
* | | | | Merge branch 'jh/clean-exclude'Junio C Hamano2010-09-061-1/+1
|\ \ \ \ \
| * | | | | builtin/clean.c: Use STRING_LIST_INIT_NODUP.Thiago Farina2010-09-061-1/+1
* | | | | | t3404 & t7508: cd inside subshell instead of aroundJens Lehmann2010-09-062-4/+4
* | | | | | Merge branch 'maint'v1.7.3-rc0Junio C Hamano2010-09-063-11/+11
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'xx/trivial' into maintJunio C Hamano2010-09-063-11/+11
| |\ \ \ \ \
| | * | | | | tag.c: whitespace breakages fixJunio C Hamano2010-09-051-9/+9
| | * | | | | Fix whitespace issue in object.cJared Hance2010-09-051-4/+4
| | * | | | | t5505: add missing &&Jens Lehmann2010-09-051-1/+1
* | | | | | | Merge branch 'jl/submodule-ignore-diff'Junio C Hamano2010-09-043-5/+42
|\ \ \ \ \ \ \
| * | | | | | | checkout: Use submodule.*.ignore settings from .git/config and .gitmodulesJens Lehmann2010-08-302-0/+21
| * | | | | | | checkout: Add test for diff.ignoreSubmodulesJens Lehmann2010-08-302-1/+9
| * | | | | | | checkout: respect diff.ignoreSubmodules settingJohannes Schindelin2010-08-251-4/+12
* | | | | | | | Merge branch 'ab/test-2'Junio C Hamano2010-09-0451-559/+968
|\ \ \ \ \ \ \ \
| * | | | | | | | tests: factor HOME=$(pwd) in test-lib.shMatthieu Moy2010-08-315-13/+3
| * | | | | | | | test-lib: use subshell instead of cd $new && .. && cd $oldÆvar Arnfjörð Bjarmason2010-08-311-6/+6
| * | | | | | | | tests: simplify "missing PREREQ" messageJonathan Nieder2010-08-311-1/+7
| * | | | | | | | t/t0000-basic.sh: Run the passing TODO test inside its own test-libÆvar Arnfjörð Bjarmason2010-08-311-0/+31
| * | | | | | | | test-lib: Allow overriding of TEST_DIRECTORYÆvar Arnfjörð Bjarmason2010-08-311-1/+7
| * | | | | | | | test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../Ævar Arnfjörð Bjarmason2010-08-311-14/+15
| * | | | | | | | test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../Ævar Arnfjörð Bjarmason2010-08-311-8/+8
| * | | | | | | | test: Introduce $GIT_BUILD_DIRThomas Rast2010-08-311-0/+1
| * | | | | | | | cvs tests: do not touch test CVS repositories shipped with sourceJunio C Hamano2010-08-185-11/+9
| * | | | | | | | t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisiteÆvar Arnfjörð Bjarmason2010-08-181-13/+15
| * | | | | | | | t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisiteÆvar Arnfjörð Bjarmason2010-08-181-11/+13
| * | | | | | | | t/t7105-reset-patch.sh: Add a PERL prerequisiteÆvar Arnfjörð Bjarmason2010-08-181-4/+4
| * | | | | | | | t/t9001-send-email.sh: convert setup code to testsÆvar Arnfjörð Bjarmason2010-08-181-3/+40
| * | | | | | | | t/t9001-send-email.sh: change from skip_all=* to prereq skipÆvar Arnfjörð Bjarmason2010-08-181-82/+83
| * | | | | | | | t/t9001-send-email.sh: Remove needless PROG=* assignmentÆvar Arnfjörð Bjarmason2010-08-181-1/+0
| * | | | | | | | t/t9600-cvsimport.sh: change from skip_all=* to prereq skipÆvar Arnfjörð Bjarmason2010-08-181-21/+18
| * | | | | | | | lib-patch-mode tests: change from skip_all=* to prereq skipÆvar Arnfjörð Bjarmason2010-08-184-28/+23
| * | | | | | | | t/t3701-add-interactive.sh: change from skip_all=* to prereq skipÆvar Arnfjörð Bjarmason2010-08-181-34/+70
| * | | | | | | | tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.shÆvar Arnfjörð Bjarmason2010-08-186-31/+16
| * | | | | | | | t/Makefile: Create test-results dir for smoke targetÆvar Arnfjörð Bjarmason2010-08-181-1/+1
| * | | | | | | | git-notes: Run partial expensive test everywhereÆvar Arnfjörð Bjarmason2010-08-181-12/+20
| * | | | | | | | t/t3300-funny-names: change from skip_all=* to prereq skipÆvar Arnfjörð Bjarmason2010-08-181-22/+60