summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* for-each-ref: add '--merged' and '--no-merged' optionsKarthik Nayak2015-08-031-0/+23
* for-each-ref: add '--points-at' optionKarthik Nayak2015-08-031-0/+20
* t6302: for-each-ref tests for ref-filter APIsKarthik Nayak2015-08-031-0/+26
* Merge branch 'jk/squelch-missing-link-warning-for-unreachable'Junio C Hamano2015-06-111-0/+15
|\
| * silence broken link warnings with revs->ignore_missing_linksJeff King2015-06-011-0/+15
* | Merge branch 'pt/pull-tests'Junio C Hamano2015-06-112-36/+175
|\ \
| * | t5520: check reflog action in fast-forward mergept/pull-testsPaul Tan2015-05-291-3/+10
| * | t5521: test --dry-run does not make any changesPaul Tan2015-05-291-0/+13
| * | t5520: test --rebase failure on unborn branch with indexPaul Tan2015-05-291-0/+15
| * | t5520: test --rebase with multiple branchesPaul Tan2015-05-291-0/+9
| * | t5520: test work tree fast-forward when fetch updates headPaul Tan2015-05-291-0/+21
| * | t5520: test for failure if index has unresolved entriesPaul Tan2015-05-291-0/+19
| * | t5520: test no merge candidates casesPaul Tan2015-05-181-0/+55
| * | t5520: prevent field splitting in content comparisonsPaul Tan2015-05-181-35/+35
* | | Merge branch 'mh/verify-lock-error-report'Junio C Hamano2015-06-111-7/+7
|\ \ \
| * | | ref_transaction_commit(): do not capitalize error messagesmh/verify-lock-error-reportMichael Haggerty2015-05-271-7/+7
* | | | Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano2015-06-111-238/+270
|\ \ \ \
| * | | | diff.c: --ws-error-highlight=<kind> optionJunio C Hamano2015-05-261-0/+96
| * | | | t4015: separate common setup and per-test expectationJunio C Hamano2015-05-261-12/+13
| * | | | t4015: modernise styleJunio C Hamano2015-05-261-238/+173
| | |_|/ | |/| |
* | | | 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
|\ \ \ \ \ \ \ \ \ \