summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lf/ref-is-hidden-namespace'Jeff King2015-11-201-0/+41
|\
| * t5509: add basic tests for hideRefslf/ref-is-hidden-namespaceLukas Fleischer2015-11-051-0/+41
* | Merge branch 'dk/gc-idx-wo-pack'Jeff King2015-11-201-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 'mk/blame-first-parent'Junio C Hamano2015-11-031-0/+36
|\ \
| * | blame: allow blame --reverse --first-parent when it makes sensemk/blame-first-parentMax Kirillov2015-10-301-1/+1
| * | blame: test to describe use of blame --reverse --first-parentMax Kirillov2015-10-301-0/+36
* | | Merge branch 'rs/wt-status-detached-branch-fix'Junio C Hamano2015-11-031-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 'js/git-gdb'Junio C Hamano2015-11-032-0/+13
|\ \ \ \
| * | | | test: facilitate debugging Git executables in tests with gdbjs/git-gdbJohannes Schindelin2015-10-302-0/+13
* | | | | Merge branch 'da/difftool'Junio C Hamano2015-11-031-0/+19
|\ \ \ \ \
| * | | | | difftool: ignore symbolic links in use_wt_fileDavid Aguilar2015-10-291-0/+19
* | | | | | Merge branch 'kn/for-each-branch'Junio C Hamano2015-11-031-1/+1
|\ \ \ \ \ \
| * | | | | | ref-filter: fallback on alphabetical comparisonkn/for-each-branchKarthik Nayak2015-10-301-1/+1
* | | | | | | Merge branch 'jk/merge-file-exit-code'Junio C Hamano2015-10-301-0/+33
|\ \ \ \ \ \ \
| * | | | | | | merge-file: clamp exit code to maximum 127jk/merge-file-exit-codeJeff King2015-10-291-0/+33
* | | | | | | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-10-301-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase-i: work around Windows CRLF line endingsgr/rebase-i-drop-warnJunio C Hamano2015-10-281-1/+1
| * | | | | | | | t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endingsJohannes Schindelin2015-10-281-0/+12
* | | | | | | | | 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