summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-09-092-4/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | xdiff-interface.c: always trim trailing space from xfuncname matchesBrandon Casey2010-09-091-3/+2
| * | | | | | | | | | diff.c: call regfree to free memory allocated by regcomp when necessaryBrandon Casey2010-09-091-1/+4
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | t/t4018: test whether the word_regex patterns compileBrandon Casey2010-09-091-0/+5
* | | | | | | | | | t/t5510-fetch.sh: improve testing with explicit URL and merge specBrandon Casey2010-09-091-2/+28
* | | | | | | | | | builtin/fetch.c: comment that branch->remote_name is usable when has_mergeBrandon Casey2010-09-091-0/+3
* | | | | | | | | | Makefile: use compat regex on IRIX 6.5Brandon Casey2010-09-091-0/+2
* | | | | | | | | | t/t7008: workaround broken handling of \000 by printf on IRIXBrandon Casey2010-09-091-7/+7
* | | | | | | | | | Merge branch 'tf/cleanup-builtin-help-headers'Junio C Hamano2010-09-083-11/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin.h: Move two functions definitions to help.h.Thiago Farina2010-09-013-11/+13
* | | | | | | | | | | Merge branch 'jk/test-must-fail-missing'Junio C Hamano2010-09-081-2/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tests: make test_might_fail fail on missing commandsJonathan Nieder2010-08-311-0/+3
| * | | | | | | | | | | tests: make test_might_fail more verboseJonathan Nieder2010-08-311-1/+6
| * | | | | | | | | | | tests: make test_must_fail fail on missing commandsJeff King2010-08-311-0/+3
| * | | | | | | | | | | tests: make test_must_fail more verboseJeff King2010-08-311-1/+9
* | | | | | | | | | | | Merge branch 'jh/error-removing-missing-note'Junio C Hamano2010-09-084-9/+30
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | notes: Don't create (empty) commit when removing non-existing notesJohan Herland2010-08-314-9/+30
| |/ / / / / / / / / / /
* | | | | | | | | | | | 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
View Lorry Controller Status