summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh/p4-multi-depot'Junio C Hamano2015-12-281-1/+27
|\
| * git-p4: reduce number of server queries for fetchessh/p4-multi-depotSam Hocevar2015-12-211-1/+1
| * git-p4: failing test case for skipping changes with multiple depotsLuke Diamand2015-12-141-1/+27
* | Merge branch 'jk/pending-keep-tag-name'Junio C Hamano2015-12-281-0/+29
|\ \
| * | revision.c: propagate tag names from pending arrayjk/pending-keep-tag-nameJeff King2015-12-171-0/+29
* | | Merge branch 'jk/symbolic-ref-maint'Junio C Hamano2015-12-281-0/+22
|\ \ \
| * | | t1401: test reflog creation for git-symbolic-refjk/symbolic-ref-maintJeff King2015-12-211-0/+16
| * | | symbolic-ref: propagate error code from create_symref()Jeff King2015-12-211-0/+6
* | | | Merge branch 'bc/format-patch-null-from-line'Junio C Hamano2015-12-211-0/+14
|\ \ \ \
| * | | | format-patch: check that header line has expected formatbc/format-patch-null-from-linebrian m. carlson2015-12-151-0/+7
| * | | | format-patch: add an option to suppress commit hashbrian m. carlson2015-12-151-0/+7
* | | | | Merge branch 'mc/push-recurse-submodules-config'Junio C Hamano2015-12-211-1/+216
|\ \ \ \ \
| * | | | | push: follow the "last one wins" convention for --recurse-submodulesmc/push-recurse-submodules-configMike Crowe2015-12-041-0/+41
| * | | | | push: test that --recurse-submodules on command line overrides configMike Crowe2015-12-041-4/+28
| * | | | | push: add recurseSubmodules config optionMike Crowe2015-11-201-1/+151
| |/ / / /
* | | | | Merge branch 'fr/rebase-i-continue-preserve-options'Junio C Hamano2015-12-161-0/+16
|\ \ \ \ \
| * | | | | rebase -i: remember merge options beyond continue actionsfr/rebase-i-continue-preserve-optionsFabian Ruch2015-12-111-0/+16
| * | | | | Merge branch 'cb/t3404-shellquote' into maintJunio C Hamano2015-12-111-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintJunio C Hamano2015-12-114-16/+31
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sg/bash-prompt-dirty-orphan' into maintJunio C Hamano2015-12-081-3/+28
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/rebase-no-autostash' into maintJunio C Hamano2015-12-081-0/+10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'da/difftool' into maintJunio C Hamano2015-12-041-0/+19
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'dk/gc-idx-wo-pack' into maintJunio C Hamano2015-12-041-0/+21
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/p4-keep-empty-commits'Junio C Hamano2015-12-151-0/+134
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | git-p4: add option to keep empty commitsls/p4-keep-empty-commitsLars Schneider2015-12-101-0/+134
* | | | | | | | | | | | Merge branch 'cb/t3404-shellquote'Junio C Hamano2015-12-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | t3404: fix quoting of redirect for some versions of bashcb/t3404-shellquoteCharles Bailey2015-12-041-1/+1
* | | | | | | | | | | | Merge branch 'ls/test-must-fail-sigpipe'Junio C Hamano2015-12-083-20/+41
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add "ok=sigpipe" to test_must_fail and use it to fix flaky testsls/test-must-fail-sigpipeLars Schneider2015-11-283-6/+8
| * | | | | | | | | | | | implement test_might_fail using a refactored test_must_failLars Schneider2015-11-281-14/+33
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sg/bash-prompt-dirty-orphan'Junio C Hamano2015-12-041-3/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | bash prompt: indicate dirty index even on orphan branchessg/bash-prompt-dirty-orphanSZEDER Gábor2015-11-241-2/+2
| * | | | | | | | | | | bash prompt: test dirty index and worktree while on an orphan branchSZEDER Gábor2015-11-241-3/+28
* | | | | | | | | | | | Merge branch 'jk/send-email-complete-aliases'Junio C Hamano2015-12-041-0/+82
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | sendemail: teach git-send-email to dump alias namesJacob Keller2015-11-201-0/+82
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/filter-branch-no-index'Junio C Hamano2015-12-041-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | filter-branch: skip index read/write when possibleJeff King2015-11-061-0/+19
* | | | | | | | | | | | | Merge branch 'mk/blame-first-parent'Jeff King2015-12-011-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | blame: fix object casting regressionJeff King2015-11-241-0/+7
* | | | | | | | | | | | | | Merge branch 'rs/fsck-nul-header'Jeff King2015-12-011-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fsck: treat a NUL in a tag header as an errorRené Scharfe2015-11-201-1/+1
| * | | | | | | | | | | | | | t1450: add tests for NUL in headers of commits and tagsRené Scharfe2015-11-201-0/+32
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ls/p4-test-timeouts'Jeff King2015-12-011-9/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-p4: add trap to kill p4d on test exitLars Schneider2015-11-201-0/+9
| * | | | | | | | | | | | | | git-p4: add p4d timeout in testsLars Schneider2015-11-201-1/+19
| * | | | | | | | | | | | | | git-p4: retry kill/cleanup operations in tests with timeoutLars Schneider2015-11-201-8/+34
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'js/test-modernize-t9300'Jeff King2015-12-011-1783/+1798
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | modernize t9300: move test preparations into test_expect_successJohannes Sixt2015-11-201-1250/+1264
| * | | | | | | | | | | | | | modernize t9300: mark here-doc words to ignore tab indentationJohannes Sixt2015-11-201-100/+100
| * | | | | | | | | | | | | | modernize t9300: use test_when_finished for clean-upJohannes Sixt2015-11-201-20/+16
View Lorry Controller Status