Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Makefile: use compat regex on IRIX 6.5 | Brandon Casey | 2010-09-09 | 1 | -0/+2 |
* | t/t7008: workaround broken handling of \000 by printf on IRIX | Brandon Casey | 2010-09-09 | 1 | -7/+7 |
* | Merge branch 'tf/cleanup-builtin-help-headers' | Junio C Hamano | 2010-09-08 | 3 | -11/+13 |
|\ | |||||
| * | builtin.h: Move two functions definitions to help.h. | Thiago Farina | 2010-09-01 | 3 | -11/+13 |
* | | Merge branch 'jk/test-must-fail-missing' | Junio C Hamano | 2010-09-08 | 1 | -2/+21 |
|\ \ | |||||
| * | | tests: make test_might_fail fail on missing commands | Jonathan Nieder | 2010-08-31 | 1 | -0/+3 |
| * | | tests: make test_might_fail more verbose | Jonathan Nieder | 2010-08-31 | 1 | -1/+6 |
| * | | tests: make test_must_fail fail on missing commands | Jeff King | 2010-08-31 | 1 | -0/+3 |
| * | | tests: make test_must_fail more verbose | Jeff King | 2010-08-31 | 1 | -1/+9 |
* | | | Merge branch 'jh/error-removing-missing-note' | Junio C Hamano | 2010-09-08 | 4 | -9/+30 |
|\ \ \ | |||||
| * | | | notes: Don't create (empty) commit when removing non-existing notes | Johan Herland | 2010-08-31 | 4 | -9/+30 |
| |/ / | |||||
* | | | Merge branch 'kf/askpass-config' | Junio C Hamano | 2010-09-08 | 7 | -5/+26 |
|\ \ \ | |||||
| * | | | Extend documentation of core.askpass and GIT_ASKPASS. | Knut Franke | 2010-08-31 | 2 | -2/+12 |
| * | | | Allow core.askpass to override SSH_ASKPASS. | Knut Franke | 2010-08-31 | 2 | -4/+2 |
| * | | | Add a new option 'core.askpass'. | Anselm Kruis | 2010-08-31 | 5 | -1/+14 |
* | | | | Merge branch 'bc/maint-fetch-url-only' | Junio C Hamano | 2010-09-08 | 2 | -1/+9 |
|\ \ \ \ | |||||
| * | | | | builtin/fetch.c: ignore merge config when not fetching from branch's remote | Brandon Casey | 2010-08-25 | 2 | -2/+4 |
| * | | | | t/t5510: demonstrate failure to fetch when current branch has merge ref | Brandon Casey | 2010-08-25 | 1 | -0/+6 |
* | | | | | Merge branch 'jk/maint-pass-c-config-in-env' | Junio C Hamano | 2010-09-08 | 5 | -5/+83 |
|\ \ \ \ \ | |||||
| * | | | | | do not pass "git -c foo=bar" params to transport helpers | Jonathan Nieder | 2010-08-24 | 3 | -1/+25 |
| * | | | | | pass "git -c foo=bar" params through environment | Jeff King | 2010-08-24 | 3 | -4/+58 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'en/d-f-conflict-fix' | Junio C Hamano | 2010-09-08 | 1 | -1/+9 |
|\ \ \ \ \ | |||||
| * | | | | | fast-export: ensure that a renamed file is printed after all references | Johannes Sixt | 2010-09-08 | 1 | -1/+9 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-09-06 | 1 | -1/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | revert: Fix trivial comment style issue | Elijah Newren | 2010-09-06 | 1 | -1/+0 |
| * | | | | | | cache_tree_free: Fix small memory leak | Elijah Newren | 2010-09-06 | 1 | -1/+3 |
* | | | | | | | Merge branch 'jh/clean-exclude' | Junio C Hamano | 2010-09-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | builtin/clean.c: Use STRING_LIST_INIT_NODUP. | Thiago Farina | 2010-09-06 | 1 | -1/+1 |
* | | | | | | | | t3404 & t7508: cd inside subshell instead of around | Jens Lehmann | 2010-09-06 | 2 | -4/+4 |
* | | | | | | | | Merge branch 'maint'v1.7.3-rc0 | Junio C Hamano | 2010-09-06 | 3 | -11/+11 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'xx/trivial' into maint | Junio C Hamano | 2010-09-06 | 3 | -11/+11 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | tag.c: whitespace breakages fix | Junio C Hamano | 2010-09-05 | 1 | -9/+9 |
| | * | | | | | | | Fix whitespace issue in object.c | Jared Hance | 2010-09-05 | 1 | -4/+4 |
| | * | | | | | | | t5505: add missing && | Jens Lehmann | 2010-09-05 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jl/submodule-ignore-diff' | Junio C Hamano | 2010-09-04 | 3 | -5/+42 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | checkout: Use submodule.*.ignore settings from .git/config and .gitmodules | Jens Lehmann | 2010-08-30 | 2 | -0/+21 |
| * | | | | | | | | | checkout: Add test for diff.ignoreSubmodules | Jens Lehmann | 2010-08-30 | 2 | -1/+9 |
| * | | | | | | | | | checkout: respect diff.ignoreSubmodules setting | Johannes Schindelin | 2010-08-25 | 1 | -4/+12 |
* | | | | | | | | | | Merge branch 'ab/test-2' | Junio C Hamano | 2010-09-04 | 51 | -559/+968 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | tests: factor HOME=$(pwd) in test-lib.sh | Matthieu Moy | 2010-08-31 | 5 | -13/+3 |
| * | | | | | | | | | | test-lib: use subshell instead of cd $new && .. && cd $old | Ævar Arnfjörð Bjarmason | 2010-08-31 | 1 | -6/+6 |
| * | | | | | | | | | | tests: simplify "missing PREREQ" message | Jonathan Nieder | 2010-08-31 | 1 | -1/+7 |
| * | | | | | | | | | | t/t0000-basic.sh: Run the passing TODO test inside its own test-lib | Ævar Arnfjörð Bjarmason | 2010-08-31 | 1 | -0/+31 |
| * | | | | | | | | | | test-lib: Allow overriding of TEST_DIRECTORY | Ævar Arnfjörð Bjarmason | 2010-08-31 | 1 | -1/+7 |
| * | | | | | | | | | | test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../ | Ævar Arnfjörð Bjarmason | 2010-08-31 | 1 | -14/+15 |
| * | | | | | | | | | | test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../ | Ævar Arnfjörð Bjarmason | 2010-08-31 | 1 | -8/+8 |
| * | | | | | | | | | | test: Introduce $GIT_BUILD_DIR | Thomas Rast | 2010-08-31 | 1 | -0/+1 |
| * | | | | | | | | | | cvs tests: do not touch test CVS repositories shipped with source | Junio C Hamano | 2010-08-18 | 5 | -11/+9 |
| * | | | | | | | | | | t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite | Ævar Arnfjörð Bjarmason | 2010-08-18 | 1 | -13/+15 |
| * | | | | | | | | | | t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite | Ævar Arnfjörð Bjarmason | 2010-08-18 | 1 | -11/+13 |