summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/pending-keep-tag-name' into maintJunio C Hamano2016-01-041-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' into maintJunio C Hamano2016-01-041-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 'ls/p4-keep-empty-commits' into maintJunio 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' into maintJunio 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 'jk/test-lint-forbid-when-finished-in-subshell' into maintJunio C Hamano2015-12-114-16/+31
|\ \ \ \ \
| * | | | | test-lib-functions: detect test_when_finished in subshelljk/test-lint-forbid-when-finished-in-subshellJohn Keeping2015-09-081-0/+5
| * | | | | t7800: don't use test_config in a subshellJohn Keeping2015-09-081-4/+4
| * | | | | test-lib-functions: support "test_config -C <dir> ..."John Keeping2015-09-081-3/+17
| * | | | | t5801: don't use test_when_finished in a subshellJohn Keeping2015-09-081-8/+4
| * | | | | t7610: don't use test_config in a subshellJohn Keeping2015-09-081-1/+1
* | | | | | Merge branch 'sg/bash-prompt-dirty-orphan' into maintJunio C Hamano2015-12-081-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/rebase-no-autostash' into maintJunio C Hamano2015-12-081-0/+10
|\ \ \ \ \ \ \
| * | | | | | | rebase: support --no-autostashJohn Keeping2015-09-101-0/+10
* | | | | | | | Merge branch 'da/difftool' into maintJunio C Hamano2015-12-041-0/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | difftool: ignore symbolic links in use_wt_fileDavid Aguilar2015-10-291-0/+19
| |/ / / / / / /
* | | | | | | | Merge branch 'dk/gc-idx-wo-pack' into maintJunio C Hamano2015-12-041-0/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | gc: remove garbage .idx files from pack dirdk/gc-idx-wo-packDoug Kelly2015-11-041-1/+1
| * | | | | | | | t5304: test cleaning pack garbageDoug Kelly2015-11-041-0/+21
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | wt-status: avoid building bogus branch name with detached HEADRené Scharfe2015-11-011-1/+1
| * | | | | | | | | | t7060: add test for status --branch on a detached HEADRené Scharfe2015-11-011-0/+14
* | | | | | | | | | | Merge branch 'jc/add-u-A-default-to-top' into maintJunio C Hamano2015-11-052-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add: simplify -u/-A without pathspecjc/add-u-A-default-to-topJunio C Hamano2015-10-242-0/+3
* | | | | | | | | | | | Merge branch 'jk/delete-modechange-conflict' into maintJunio C Hamano2015-11-053-87/+130
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | merge: detect delete/modechange conflictjk/delete-modechange-conflictJeff King2015-10-261-0/+23
| * | | | | | | | | | | | t6031: generalize for recursive and resolve strategiesJeff King2015-10-262-56/+77
| * | | | | | | | | | | | t6031: move triple-rename test to t3030Jeff King2015-10-262-31/+30
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/clone-linked-checkout' into maintJunio C Hamano2015-11-052-0/+47
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | clone: allow --local from a linked checkoutNguyễn Thái Ngọc Duy2015-09-281-0/+5
| * | | | | | | | | | | | enter_repo: allow .git files in strict modeNguyễn Thái Ngọc Duy2015-09-281-0/+10
| * | | | | | | | | | | | enter_repo: avoid duplicating logic, use is_git_directory() insteadNguyễn Thái Ngọc Duy2015-09-281-0/+14
| * | | | | | | | | | | | t0002: add test for enter_repo(), non-strict modeNguyễn Thái Ngọc Duy2015-09-281-0/+18
* | | | | | | | | | | | | Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-031-0/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status