Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jn/paginate-fix' | Junio C Hamano | 2010-07-15 |
|\ | |||
| * | git --paginate: paginate external commands again | Jonathan Nieder | 2010-07-14 |
| * | git --paginate: do not commit pager choice too early | Nguyễn Thái Ngọc Duy | 2010-06-28 |
| * | tests: local config file should be honored from subdirs of toplevel | Jonathan Nieder | 2010-06-28 |
| * | t7006: test pager configuration for several git commands | Jonathan Nieder | 2010-06-28 |
| * | t7006 (pager): introduce helper for parameterized tests | Jonathan Nieder | 2010-06-28 |
* | | Merge branch 'wp/merge-tree-fix' | Junio C Hamano | 2010-07-15 |
|\ \ | |||
| * | | merge-tree: fix where two branches share no changes | Will Palmer | 2010-07-14 |
| * | | add basic tests for merge-tree | Will Palmer | 2010-07-14 |
* | | | Merge branch 'js/merge-rr-fix' | Junio C Hamano | 2010-07-15 |
|\ \ \ | |||
| * | | | MERGE_RR is in .git, not .git/rr-cache | Jay Soffian | 2010-07-14 |
| |/ / | |||
* | | | Merge branch 'jn/tests' | Junio C Hamano | 2010-07-15 |
|\ \ \ | |||
| * | | | t3000 (ls-files -o): modernize style | Jonathan Nieder | 2010-07-11 |
* | | | | Merge branch 'jn/grep-open' | Junio C Hamano | 2010-07-15 |
|\ \ \ \ | |||
| * | | | | grep -O: Do not pass color sequences as filenames to pager | Nazri Ramliy | 2010-07-07 |
* | | | | | Merge branch 'jc/rebase-i-commit-msg-fix' | Junio C Hamano | 2010-07-15 |
|\ \ \ \ \ | |||
| * | | | | | rebase-i: do not get fooled by a log message ending with backslash | Junio C Hamano | 2010-07-05 |
* | | | | | | Merge branch 'ab/submodule-add-f' | Junio C Hamano | 2010-07-15 |
|\ \ \ \ \ \ | |||
| * | | | | | | git submodule: add submodules with git add -f <path> | Ævar Arnfjörð Bjarmason | 2010-07-05 |
* | | | | | | | Merge branch 'jc/read-tree-cache-tree-fix' | Junio C Hamano | 2010-07-14 |
|\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix | Junio C Hamano | 2010-07-08 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||
| * | | | | | | | Fix "read-tree -m A B" priming the cache-tree | Junio C Hamano | 2010-07-08 |
* | | | | | | | | test-lib: TAP compliance for skipping tests on request | Michael J Gruber | 2010-07-12 |
* | | | | | | | | test-lib: simplify GIT_SKIP_TESTS loop | Michael J Gruber | 2010-07-12 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-07-11 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||
| * | | | | | | | t0005: work around strange $? in ksh when program terminated by a signal | Johannes Sixt | 2010-07-09 |
* | | | | | | | | tests: Use skip_all=* to skip tests | Ævar Arnfjörð Bjarmason | 2010-07-08 |
* | | | | | | | | t9118 (git-svn): prevent early failure from taking down later tests | Jonathan Nieder | 2010-07-08 |
* | | | | | | | | t9118: avoid PEG revision identifier in tests | Michael J Gruber | 2010-07-08 |
| |_|/ / / / / |/| | | | | | | |||
* | | | | | | | Merge branch 'ab/tap' | Junio C Hamano | 2010-07-07 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t/README: document more test helpers | Jonathan Nieder | 2010-07-06 |
| * | | | | | | | t/README: proposed rewording... | Junio C Hamano | 2010-07-05 |
| * | | | | | | | t/README: Document the do's and don'ts of tests | Ævar Arnfjörð Bjarmason | 2010-07-05 |
| * | | | | | | | t/README: Add a section about skipping tests | Ævar Arnfjörð Bjarmason | 2010-07-05 |
| * | | | | | | | t/README: Document test_expect_code | Ævar Arnfjörð Bjarmason | 2010-07-05 |
| * | | | | | | | t/README: Document test_external* | Ævar Arnfjörð Bjarmason | 2010-07-05 |
| * | | | | | | | t/README: Document the prereq functions, and 3-arg test_* | Ævar Arnfjörð Bjarmason | 2010-07-05 |
| * | | | | | | | t/README: Typo: paralell -> parallel | Ævar Arnfjörð Bjarmason | 2010-07-05 |
| * | | | | | | | t/README: The trash is in 't/trash directory.$name' | Ævar Arnfjörð Bjarmason | 2010-07-05 |
| * | | | | | | | t/t9700/test.pl: don't access private object members, use public access methods | Brandon Casey | 2010-06-29 |
| * | | | | | | | t9700: Use Test::More->builder, not $Test::Builder::Test | Ævar Arnfjörð Bjarmason | 2010-06-27 |
| * | | | | | | | tests: Say "pass" rather than "ok" on empty lines for TAP | Ævar Arnfjörð Bjarmason | 2010-06-25 |
| * | | | | | | | tests: Skip tests in a way that makes sense under TAP | Ævar Arnfjörð Bjarmason | 2010-06-25 |
| * | | | | | | | test-lib: output a newline before "ok" under a TAP harness | Ævar Arnfjörð Bjarmason | 2010-06-25 |
| * | | | | | | | test-lib: Make the test_external_* functions TAP-aware | Ævar Arnfjörð Bjarmason | 2010-06-25 |
| * | | | | | | | test-lib: Adjust output to be valid TAP format | Ævar Arnfjörð Bjarmason | 2010-06-25 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-07-07 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | Merge branch 'maint-1.6.4' into maint | Junio C Hamano | 2010-07-07 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||
| | * | | | | | | rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option | Uwe Kleine-König | 2010-07-07 |
| * | | | | | | | Merge branch 'tr/receive-pack-aliased-update-fix' into maint | Junio C Hamano | 2010-07-07 |
| |\ \ \ \ \ \ \ |