summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/delete-modechange-conflict'Junio C Hamano2015-10-303-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 'jc/add-u-A-default-to-top'Junio C Hamano2015-10-302-0/+3
|\ \
| * | add: simplify -u/-A without pathspecjc/add-u-A-default-to-topJunio C Hamano2015-10-242-0/+3
* | | Merge branch 'ar/clone-dissociate'Junio C Hamano2015-10-301-0/+11
|\ \ \
| * | | clone: allow "--dissociate" without referencear/clone-dissociateAlex Riesen2015-10-221-0/+11
* | | | Merge branch 'jk/repository-extension'Junio C Hamano2015-10-261-0/+60
|\ \ \ \
| * | | | introduce "preciousObjects" repository extensionjk/repository-extensionJeff King2015-06-241-0/+22
| * | | | introduce "extensions" form of core.repositoryformatversionJeff King2015-06-241-0/+38
* | | | | Merge branch 'dt/t7063-fix-flaky-test'Junio C Hamano2015-10-261-1/+3
|\ \ \ \ \
| * | | | | t7063: fix flaky untracked-cache testdt/t7063-fix-flaky-testDavid Turner2015-10-191-1/+3
* | | | | | Merge branch 'mr/worktree-list'Junio C Hamano2015-10-261-0/+89
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | worktree: add 'list' commandmr/worktree-listMichael Rappazzo2015-10-081-0/+89
* | | | | | Merge branch 'tb/t0027-crlf'Junio C Hamano2015-10-201-34/+157
|\ \ \ \ \ \
| * | | | | | t0027: improve test for not-normalized filestb/t0027-crlfTorsten Bögershausen2015-10-121-34/+157
* | | | | | | Merge branch 'ls/p4-test-updates'Junio C Hamano2015-10-202-5/+8
|\ \ \ \ \ \ \
| * | | | | | | git-p4: skip t9819 test case on case insensitive file systemsls/p4-test-updatesLars Schneider2015-10-121-0/+6
| * | | | | | | git-p4: avoid "stat" command in t9815 git-p4-submit-failLars Schneider2015-10-121-5/+2
* | | | | | | | Merge branch 'jk/war-on-sprintf'Junio C Hamano2015-10-203-2/+59
|\ \ \ \ \ \ \ \
| * | | | | | | | init: use strbufs to store pathsJeff King2015-10-051-2/+2
| * | | | | | | | remote-ext: simplify git pkt-line generationJeff King2015-09-251-0/+28
| * | | | | | | | resolve_ref: use strbufs for internal buffersJeff King2015-09-251-0/+29
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line'Junio C Hamano2015-10-161-0/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | filter-branch: remove multi-line headers in msg filterjk/filter-branch-use-of-sed-on-incomplete-lineJames McCoy2015-10-121-0/+14
* | | | | | | | | Merge branch 'ls/p4-lfs'Junio C Hamano2015-10-152-0/+480
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-p4: add Git LFS backend for large file systemLars Schneider2015-10-031-0/+288
| * | | | | | | | | git-p4: add support for large file systemsLars Schneider2015-10-031-0/+192
* | | | | | | | | | Merge branch 'js/gc-with-stale-symref'Junio C Hamano2015-10-151-0/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pack-objects: do not get distracted by broken symrefsjs/gc-with-stale-symrefJohannes Schindelin2015-10-081-1/+1
| * | | | | | | | | | gc: demonstrate failure with stale remote HEADJohannes Schindelin2015-10-051-0/+13
* | | | | | | | | | | Merge branch 'js/clone-dissociate'Junio C Hamano2015-10-151-0/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clone --dissociate: avoid locking pack filesjs/clone-dissociateJohannes Schindelin2015-10-071-1/+1
| * | | | | | | | | | | t5700: demonstrate a Windows file locking issue with `git clone --dissociate`Johannes Schindelin2015-10-051-0/+21
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'es/worktree-add-cleanup'Junio C Hamano2015-10-151-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t2026: rename worktree prune testes/worktree-add-cleanupMichael J Gruber2015-10-071-0/+0
* | | | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-10-151-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rebase-i: loosen over-eager check_bad_cmd checkMatthieu Moy2015-10-051-0/+15
* | | | | | | | | | | | | Merge branch 'mm/detach-at-HEAD-reflog'Junio C Hamano2015-10-151-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | status: don't say 'HEAD detached at HEAD'mm/detach-at-HEAD-reflogMatthieu Moy2015-10-021-1/+1
| * | | | | | | | | | | | | t3203: test 'detached at' after checkout --detachMatthieu Moy2015-10-021-0/+13
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'nd/clone-linked-checkout'Junio C Hamano2015-10-152-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 'kn/for-each-branch'Junio C Hamano2015-10-152-11/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | branch: add '--points-at' optionKarthik Nayak2015-09-251-0/+9
| * | | | | | | | | | | | | | branch.c: use 'ref-filter' APIsKarthik Nayak2015-09-252-11/+31