summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | Merge branch 'sb/perf-without-installed-git'Junio C Hamano2015-10-151-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/perf: make runner work even if Git is not installedsb/perf-without-installed-gitStephan Beyer2015-09-251-0/+1
* | | | | | | | | | Merge branch 'sb/http-flaky-test-fix'Junio C Hamano2015-10-153-23/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t5561: get rid of racy appending to logfilesb/http-flaky-test-fixStephan Beyer2015-09-253-23/+1
* | | | | | | | | | | Merge branch 'jc/fsck-dropped-errors'Junio C Hamano2015-10-151-1/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fsck: exit with non-zero when problems are foundjc/fsck-dropped-errorsJunio C Hamano2015-09-231-1/+21
* | | | | | | | | | | | Merge branch 'ls/p4-translation-failure'Junio C Hamano2015-10-151-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 'mk/submodule-gitdir-path'Junio C Hamano2015-10-151-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | path: implement common_dir handling in git_pathdup_submodule()mk/submodule-gitdir-pathMax Kirillov2015-09-141-0/+10
* | | | | | | | | | | | | Merge branch 'jk/notes-dwim-doc'Junio C Hamano2015-10-141-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | notes: correct documentation of DWIMery for notes referencesjk/notes-dwim-docJacob Keller2015-09-221-0/+6
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ls/p4-path-encoding'Junio C Hamano2015-10-071-0/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-p4: add config git-p4.pathEncodingLars Schneider2015-09-031-0/+58
* | | | | | | | | | | | | | Merge branch 'nd/ignore-then-not-ignore'Junio C Hamano2015-10-071-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | dir.c: don't exclude whole dir prematurely if neg pattern may matchnd/ignore-then-not-ignoreNguyễn Thái Ngọc Duy2015-09-211-0/+25
* | | | | | | | | | | | | | | Sync with 2.6.1Junio C Hamano2015-10-058-0/+248
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Sync with v2.5.4Junio C Hamano2015-09-288-0/+248
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Sync with 2.4.10Junio C Hamano2015-09-288-0/+248
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |