summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/wt-status-detached-branch-fix' into maintJunio C Hamano2015-11-051-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 'jc/add-u-A-default-to-top' into maintJunio C Hamano2015-11-052-0/+3
|\ \
| * | add: simplify -u/-A without pathspecjc/add-u-A-default-to-topJunio C Hamano2015-10-242-0/+3
* | | Merge branch 'jk/delete-modechange-conflict' into maintJunio C Hamano2015-11-053-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 'nd/clone-linked-checkout' into maintJunio C Hamano2015-11-052-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 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-031-0/+33
|\ \ \ \ \
| * | | | | merge-file: clamp exit code to maximum 127jk/merge-file-exit-codeJeff King2015-10-291-0/+33
| | |_|/ / | |/| | |
* | | | | Merge branch 'dt/t7063-fix-flaky-test' into maintJunio C Hamano2015-11-031-1/+3
|\ \ \ \ \
| * | | | | t7063: fix flaky untracked-cache testdt/t7063-fix-flaky-testDavid Turner2015-10-191-1/+3
* | | | | | Merge branch 'mk/submodule-gitdir-path' into maintJunio C Hamano2015-11-031-0/+10
|\ \ \ \ \ \
| * | | | | | path: implement common_dir handling in git_pathdup_submodule()mk/submodule-gitdir-pathMax Kirillov2015-09-141-0/+10
* | | | | | | Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano2015-11-031-0/+50
|\ \ \ \ \ \ \
| * | | | | | | git-p4: handle "Translation of file content failed"ls/p4-translation-failureLars Schneider2015-09-221-1/+1
| * | | | | | | git-p4: add test case for "Translation of file content failed" errorLars Schneider2015-09-221-0/+50
* | | | | | | | Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-11-031-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 'js/clone-dissociate' into maintJunio C Hamano2015-11-031-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 'ld/p4-import-labels' into maintJunio C Hamano2015-11-031-0/+45
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-p4: fix P4 label import for unprocessed commitsld/p4-import-labelsLuke Diamand2015-08-281-1/+1
| * | | | | | | | | | git-p4: failing test for ignoring invalid p4 labelsLuke Diamand2015-08-281-0/+45
* | | | | | | | | | | Merge branch 'jk/repository-extension' into maintJunio C Hamano2015-11-031-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 'js/gc-with-stale-symref' into maintJunio C Hamano2015-10-201-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 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-10-201-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 'es/worktree-add-cleanup' into maintJunio C Hamano2015-10-161-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t2026: rename worktree prune testes/worktree-add-cleanupMichael J Gruber2015-10-071-0/+0
* | | | | | | | | | | | | | Merge branch 'jc/fsck-dropped-errors' into maintJunio C Hamano2015-10-161-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fsck: exit with non-zero when problems are foundjc/fsck-dropped-errorsJunio C Hamano2015-09-231-1/+21
* | | | | | | | | | | | | | | Merge branch 'sb/http-flaky-test-fix' into maintJunio C Hamano2015-10-163-23/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t5561: get rid of racy appending to logfilesb/http-flaky-test-fixStephan Beyer2015-09-253-23/+1
* | | | | | | | | | | | | | | | Merge branch 'sb/perf-without-installed-git' into maintJunio C Hamano2015-10-161-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t/perf: make runner work even if Git is not installedsb/perf-without-installed-gitStephan Beyer2015-09-251-0/+1
* | | | | | | | | | | | | | | | | Merge branch 'mm/detach-at-HEAD-reflog' into maintJunio C Hamano2015-10-161-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | status: don't say 'HEAD detached at HEAD'mm/detach-at-HEAD-reflogMatthieu Moy2015-10-021-1/+1
View Lorry Controller Status