summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Sync with 2.3.10Junio C Hamano2015-09-288-0/+248
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | http: limit redirection depthBlake Burkhart2015-09-252-0/+7
| | | | * | | | | | | | http: limit redirection to protocol-whitelistBlake Burkhart2015-09-252-0/+10
| | | | * | | | | | | | submodule: allow only certain protocols for submodule fetchesJeff King2015-09-231-0/+43
| | | | * | | | | | | | transport: add a protocol-whitelist environment variableJeff King2015-09-236-0/+188
| | | | |/ / / / / / /
| | * | | | | | | | | Merge branch 'dt/untracked-subdir' into maintJunio C Hamano2015-09-171-0/+215
| | |\ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ Merge branch 'bb/remote-get-url'Junio C Hamano2015-10-051-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | remote: add get-url subcommandbb/remote-get-urlBen Boeckel2015-09-171-0/+37
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/blame-first-parent'Junio C Hamano2015-10-051-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | blame: handle --first-parentjk/blame-first-parentJeff King2015-09-161-0/+4
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/rebase-no-autostash'Junio C Hamano2015-10-051-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rebase: support --no-autostashJohn Keeping2015-09-101-0/+10
* | | | | | | | | | | | | Merge branch 'kn/for-each-tag'Junio C Hamano2015-10-052-7/+214
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | tag.c: implement '--merged' and '--no-merged' optionsKarthik Nayak2015-09-171-0/+27
| * | | | | | | | | | | | tag.c: implement '--format' optionKarthik Nayak2015-09-171-0/+12
| * | | | | | | | | | | | tag.c: use 'ref-filter' APIsKarthik Nayak2015-09-171-7/+1
| * | | | | | | | | | | | ref-filter: add support to sort by versionKarthik Nayak2015-09-171-0/+36
| * | | | | | | | | | | | ref-filter: add support for %(contents:lines=X)Karthik Nayak2015-09-171-0/+52
| * | | | | | | | | | | | ref-filter: implement an `align` atomKarthik Nayak2015-09-171-0/+82
| * | | | | | | | | | | | ref-filter: introduce match_atom_name()Karthik Nayak2015-09-171-0/+4
| * | | | | | | | | | | | Merge 'jk/git-path' into kn/for-each-tagJunio C Hamano2015-08-241-111/+85
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge 'kn/for-each-tag-branch' into kn/for-each-tagJunio C Hamano2015-08-241-0/+84
| |\ \ \ \ \ \ \ \ \ \ \ \ \