summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/config-set-in-non-repository'Junio C Hamano2016-02-261-0/+11
|\
| * git config: report when trying to modify a non-existing repo configjs/config-set-in-non-repositoryJohannes Schindelin2016-02-251-0/+11
* | Merge branch 'jk/epipe-in-async'Junio C Hamano2016-02-262-2/+5
|\ \
| * | t5504: handle expected output from SIGPIPE deathjk/epipe-in-asyncJeff King2016-02-251-1/+4
| * | test_must_fail: report number of unexpected signalJeff King2016-02-251-1/+1
| |/
| * Merge branch 'js/test-lib-windows-emulated-yes' into maintJunio C Hamano2016-02-171-2/+4
| |\
| * \ Merge branch 'aw/push-force-with-lease-reporting' into maintJunio C Hamano2016-02-171-5/+10
| |\ \
| * \ \ Merge branch 'js/xmerge-marker-eol' into maintJunio C Hamano2016-02-171-0/+13
| |\ \ \
* | \ \ \ Merge branch 'fa/merge-recursive-no-rename'Junio C Hamano2016-02-262-1/+313
|\ \ \ \ \
| * | | | | t3034: test deprecated interfacefa/merge-recursive-no-renameFelipe Gonçalves Assis2016-02-241-0/+46
| * | | | | t3034: test option to disable renamesFelipe Gonçalves Assis2016-02-241-0/+28
| * | | | | t3034: add rename threshold testsFelipe Gonçalves Assis2016-02-242-1/+239
* | | | | | Merge branch 'sb/submodule-module-list-fix'Junio C Hamano2016-02-261-0/+25
|\ \ \ \ \ \
| * | | | | | submodule helper list: respect correct path prefixsb/submodule-module-list-fixStefan Beller2016-02-241-0/+25
| |/ / / / /
* | | | | | Merge branch 'tb/conversion'Junio C Hamano2016-02-261-142/+172
|\ \ \ \ \ \
| * | | | | | convert.c: correct attr_action()tb/conversionTorsten Bögershausen2016-02-231-7/+26
| * | | | | | t0027: add tests for get_stream_filter()Torsten Bögershausen2016-02-081-135/+146
* | | | | | | Merge branch 'jk/grep-binary-workaround-in-test'Junio C Hamano2016-02-262-13/+17
|\ \ \ \ \ \ \
| * | | | | | | t9200: avoid grep on non-ASCII datajk/grep-binary-workaround-in-testJohn Keeping2016-02-231-1/+1
| * | | | | | | t8005: avoid grep on non-ASCII dataJohn Keeping2016-02-231-12/+16
* | | | | | | | Merge branch 'ps/config-error'Junio C Hamano2016-02-262-1/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | remote: die on config error when setting URLPatrick Steinhardt2016-02-221-0/+9
| * | | | | | | | branch: die on config error when unsetting upstreamPatrick Steinhardt2016-02-221-0/+7
| * | | | | | | | branch: report errors in tracking branch setupPatrick Steinhardt2016-02-221-1/+8
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'sg/t6050-failing-editor-test-fix' into maintJunio C Hamano2016-02-051-3/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/ref-cache-non-repository-optim' into maintJunio C Hamano2016-02-052-0/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/dirname-basename' into maintJunio C Hamano2016-02-051-0/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano2016-02-051-0/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/list-tag-2.7-regression' into maintJunio C Hamano2016-02-053-52/+38
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/sanity' into maintJunio C Hamano2016-02-051-5/+13
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/filter-branch-no-index' into maintJunio C Hamano2016-02-051-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/close-packs-before-gc' into maintJunio C Hamano2016-02-051-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/exclusion-regression-fix' into maintJunio C Hamano2016-02-051-25/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/reflog-walk-with-non-commit' into maintJunio C Hamano2016-02-051-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/send-email-mutt-alias-fix' into maintJunio C Hamano2016-02-051-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/stop-setenv-work-tree' into maintJunio C Hamano2016-02-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'mg/work-tree-tests'Junio C Hamano2016-02-263-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | tests: rename work-tree tests to *work-tree*mg/work-tree-testsMichael J Gruber2016-02-203-0/+0
* | | | | | | | | | | | | | | | | | | | Merge branch 'ls/config-origin'Junio C Hamano2016-02-263-6/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | config: add '--show-origin' option to print the origin of a config valuels/config-originLars Schneider2016-02-221-0/+147
| * | | | | | | | | | | | | | | | | | | | config: add 'origin_type' to config_source structLars Schneider2016-02-222-3/+9
| * | | | | | | | | | | | | | | | | | | | t: do not hide Git's exit code in tests using 'nul_to_q'Lars Schneider2016-02-172-3/+6
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'kn/ref-filter-atom-parsing'Junio C Hamano2016-02-261-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | ref-filter: align: introduce long-form syntaxKarthik Nayak2016-02-171-0/+42
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'tg/git-remote'Junio C Hamano2016-02-261-0/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | remote: use remote_is_configured() for add and renametg/git-remoteThomas Gummerer2016-02-161-0/+15
| * | | | | | | | | | | | | | | | | | | | remote: actually check if remote exitsThomas Gummerer2016-02-161-0/+18
* | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-add-B'Junio C Hamano2016-02-241-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | worktree add -B: do the checkout test before update branchnd/worktree-add-BNguyễn Thái Ngọc Duy2016-02-151-0/+7
| * | | | | | | | | | | | | | | | | | | | | worktree: fix "add -B"Nguyễn Thái Ngọc Duy2016-02-151-0/+8
View Lorry Controller Status