summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | modernize t9300: wrap lines after &&Johannes Sixt2015-11-201-16/+32
| * | | | | modernize t9300: use test_must_be_emptyJohannes Sixt2015-11-201-5/+3
| * | | | | modernize t9300: use test_must_failJohannes Sixt2015-11-201-14/+3
| * | | | | modernize t9300: single-quote placement and indentationJohannes Sixt2015-11-201-435/+437
| |/ / / /
* | | | | Merge branch 'maint'Jeff King2015-12-015-21/+41
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'eg/p4-submit-catch-failure' into maintJeff King2015-12-011-1/+1
| |\ \ \ \
| | * | | | git-p4: clean up after p4 submit failureeg/p4-submit-catch-failureGIRARD Etienne2015-11-241-1/+1
| * | | | | Merge branch 'ld/p4-detached-head' into maintJeff King2015-12-011-0/+16
| |\ \ \ \ \
| | * | | | | git-p4: work with a detached headld/p4-detached-headLuke Diamand2015-11-241-1/+1
| | * | | | | git-p4: add failing test for submit from detached headLuke Diamand2015-11-241-0/+16
| * | | | | | Merge branch 'sg/filter-branch-dwim-ambiguity' into maintJeff King2015-12-011-0/+7
| |\ \ \ \ \ \
| | * | | | | | filter-branch: deal with object name vs. pathname ambiguity in tree-filtersg/filter-branch-dwim-ambiguitySZEDER Gábor2015-11-241-0/+7
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'dk/t5813-unc-paths' into maintJeff King2015-12-011-2/+2
| |\ \ \ \ \ \
| | * | | | | | t5813: avoid creating urls that break on cygwindk/t5813-unc-pathsDennis Kaarsemaker2015-11-201-2/+2
| | |/ / / / /
| * | | | | | allow hooks to ignore their standard input streamcb/hook-sigpipeClemens Buchacher2015-11-161-18/+15
| |/ / / / /
| * | | | | Merge branch 'rs/wt-status-detached-branch-fix' into maintJunio C Hamano2015-11-051-0/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/add-u-A-default-to-top' into maintJunio C Hamano2015-11-052-0/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/delete-modechange-conflict' into maintJunio C Hamano2015-11-053-87/+130
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/clone-linked-checkout' into maintJunio C Hamano2015-11-052-0/+47
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-031-0/+33
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'dt/t7063-fix-flaky-test' into maintJunio C Hamano2015-11-031-1/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mk/submodule-gitdir-path' into maintJunio C Hamano2015-11-031-0/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano2015-11-031-0/+50
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-11-031-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/clone-dissociate' into maintJunio C Hamano2015-11-031-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ld/p4-import-labels' into maintJunio C Hamano2015-11-031-0/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/repository-extension' into maintJunio C Hamano2015-11-031-0/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'js/gc-with-stale-symref' into maintJunio C Hamano2015-10-201-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-10-201-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/worktree-add-cleanup' into maintJunio C Hamano2015-10-161-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \