summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ld/p4-editor-multi-words'Junio C Hamano2015-06-054-6/+46
|\
| * git-p4: tests: use test-chmtime in place of touchld/p4-editor-multi-wordsLuke Diamand2015-05-262-5/+7
| * git-p4: fix handling of multi-word P4EDITORLuke Diamand2015-05-242-2/+2
| * git-p4: add failing test for P4EDITOR handlingLuke Diamand2015-05-241-0/+38
* | Merge branch 'jk/at-push-sha1'Junio C Hamano2015-06-053-5/+79
|\ \
| * | for-each-ref: accept "%(push)" formatjk/at-push-sha1Jeff King2015-05-221-1/+12
| * | sha1_name: implement @{push} shorthandJeff King2015-05-221-0/+63
| * | remote.c: report specific errors from branch_get_upstreamJeff King2015-05-211-4/+4
* | | Merge branch 'mm/rebase-i-post-rewrite-exec'Junio C Hamano2015-06-011-36/+53
|\ \ \
| * | | t5407: use <<- to align the expected outputmm/rebase-i-post-rewrite-execJunio C Hamano2015-05-221-40/+40
| * | | rebase -i: fix post-rewrite hook with failed exec commandMatthieu Moy2015-05-221-1/+1
| * | | rebase -i: demonstrate incorrect behavior of post-rewriteMatthieu Moy2015-05-221-0/+17
* | | | Merge branch 'fm/fetch-raw-sha1'Junio C Hamano2015-06-011-0/+55
|\ \ \ \
| * | | | upload-pack: optionally allow fetching reachable sha1fm/fetch-raw-sha1Fredrik Medley2015-05-221-0/+55
* | | | | Merge branch 'dt/cat-file-follow-symlinks'Junio C Hamano2015-06-011-0/+206
|\ \ \ \ \
| * | | | | cat-file: add --follow-symlinks to --batchdt/cat-file-follow-symlinksDavid Turner2015-05-201-0/+205
* | | | | | Merge branch 'jk/stash-options'Junio C Hamano2015-06-011-0/+4
|\ \ \ \ \ \
| * | | | | | stash: complain about unknown flagsJeff King2015-05-201-0/+4
* | | | | | | Merge branch 'jh/filter-empty-contents'Junio C Hamano2015-06-011-0/+26
|\ \ \ \ \ \ \
| * | | | | | | sha1_file: pass empty buffer to index empty filejh/filter-empty-contentsJim Hill2015-05-181-0/+26
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/http-backend-deadlock'Junio C Hamano2015-06-011-13/+36
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockjk/http-backend-deadlockJunio C Hamano2015-05-251-13/+36
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3jk/http-backend-deadlock-2.3Junio C Hamano2015-05-251-13/+36
| | |\ \ \ \ \ \
| | | * | | | | | http-backend: spool ref negotiation requests to bufferjk/http-backend-deadlock-2.2Jeff King2015-05-251-0/+11
| | | * | | | | | t5551: factor out tag creationJeff King2015-05-201-13/+21
| | | | |/ / / / | | | |/| | | |
* | | | | | | | Merge branch 'nd/untracked-cache'Junio C Hamano2015-05-271-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | t7063: hide stderr from setup inside prereqJeff King2015-05-271-2/+6
* | | | | | | | | Merge branch 'nd/untracked-cache'Junio C Hamano2015-05-261-0/+353
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | t7063: tests for untracked cacheNguyễn Thái Ngọc Duy2015-03-121-0/+353
* | | | | | | | | Merge branch 'pt/pull-ff-vs-merge-ff'Junio C Hamano2015-05-261-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pull: make pull.ff=true override merge.ffPaul Tan2015-05-181-0/+8
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'pt/pull-log-n'Junio C Hamano2015-05-261-0/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pull: handle --log=<n>pt/pull-log-nPaul Tan2015-05-181-0/+17
| * | | | | | | | | Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3Junio C Hamano2015-05-111-4/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/diff-no-index-d-f' into maint-2.3Junio C Hamano2015-05-111-0/+34
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sb/t1020-cleanup'Junio C Hamano2015-05-221-4/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | subdirectory tests: code cleanup, uncomment testsb/t1020-cleanupStefan Beller2015-05-181-4/+7
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/ignore-epipe-in-filter'Junio C Hamano2015-05-221-0/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | filter_buffer_or_fd(): ignore EPIPEjc/ignore-epipe-in-filterJunio C Hamano2015-05-201-0/+10
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mh/lockfile-retry'Junio C Hamano2015-05-221-0/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | lock_packed_refs(): allow retries when acquiring the packed-refs lockmh/lockfile-retryMichael Haggerty2015-05-141-0/+17
* | | | | | | | | | | | Merge branch 'jk/add-e-kill-editor'Junio C Hamano2015-05-221-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add: check return value of launch_editorjk/add-e-kill-editorJeff King2015-05-121-0/+7
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sg/completion-config'Junio C Hamano2015-05-221-0/+34
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | completion: simplify query for config variablessg/completion-configSZEDER Gábor2015-05-121-0/+12
| * | | | | | | | | | | | completion: add a helper function to get config variablesSZEDER Gábor2015-05-121-0/+22
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mh/ref-directory-file'Junio C Hamano2015-05-222-7/+114
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ref_transaction_commit(): delete extra "the" from error messageMichael Haggerty2015-05-111-7/+7
| * | | | | | | | | | | | lock_ref_sha1_basic(): improve diagnostics for ref D/F conflictsMichael Haggerty2015-05-111-4/+4
| * | | | | | | | | | | | refs: check for D/F conflicts among refs created in a transactionMichael Haggerty2015-05-111-1/+1
View Lorry Controller Status