Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/clone-linked-checkout' | Junio C Hamano | 2015-10-15 | 2 | -0/+47 |
|\ | |||||
| * | clone: allow --local from a linked checkout | Nguyễn Thái Ngọc Duy | 2015-09-28 | 1 | -0/+5 |
| * | enter_repo: allow .git files in strict mode | Nguyễn Thái Ngọc Duy | 2015-09-28 | 1 | -0/+10 |
| * | enter_repo: avoid duplicating logic, use is_git_directory() instead | Nguyễn Thái Ngọc Duy | 2015-09-28 | 1 | -0/+14 |
| * | t0002: add test for enter_repo(), non-strict mode | Nguyễn Thái Ngọc Duy | 2015-09-28 | 1 | -0/+18 |
* | | Merge branch 'kn/for-each-branch' | Junio C Hamano | 2015-10-15 | 2 | -11/+40 |
|\ \ | |||||
| * | | branch: add '--points-at' option | Karthik Nayak | 2015-09-25 | 1 | -0/+9 |
| * | | branch.c: use 'ref-filter' APIs | Karthik Nayak | 2015-09-25 | 2 | -11/+31 |
* | | | Merge branch 'sb/perf-without-installed-git' | Junio C Hamano | 2015-10-15 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | t/perf: make runner work even if Git is not installedsb/perf-without-installed-git | Stephan Beyer | 2015-09-25 | 1 | -0/+1 |
* | | | | Merge branch 'sb/http-flaky-test-fix' | Junio C Hamano | 2015-10-15 | 3 | -23/+1 |
|\ \ \ \ | |||||
| * | | | | t5561: get rid of racy appending to logfilesb/http-flaky-test-fix | Stephan Beyer | 2015-09-25 | 3 | -23/+1 |
* | | | | | Merge branch 'jc/fsck-dropped-errors' | Junio C Hamano | 2015-10-15 | 1 | -1/+21 |
|\ \ \ \ \ | |||||
| * | | | | | fsck: exit with non-zero when problems are foundjc/fsck-dropped-errors | Junio C Hamano | 2015-09-23 | 1 | -1/+21 |
* | | | | | | Merge branch 'ls/p4-translation-failure' | Junio C Hamano | 2015-10-15 | 1 | -0/+50 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-p4: handle "Translation of file content failed"ls/p4-translation-failure | Lars Schneider | 2015-09-22 | 1 | -1/+1 |
| * | | | | | | git-p4: add test case for "Translation of file content failed" error | Lars Schneider | 2015-09-22 | 1 | -0/+50 |
* | | | | | | | Merge branch 'mk/submodule-gitdir-path' | Junio C Hamano | 2015-10-15 | 1 | -0/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | path: implement common_dir handling in git_pathdup_submodule()mk/submodule-gitdir-path | Max Kirillov | 2015-09-14 | 1 | -0/+10 |
* | | | | | | | | Merge branch 'jk/notes-dwim-doc' | Junio C Hamano | 2015-10-14 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | notes: correct documentation of DWIMery for notes referencesjk/notes-dwim-doc | Jacob Keller | 2015-09-22 | 1 | -0/+6 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ls/p4-path-encoding' | Junio C Hamano | 2015-10-07 | 1 | -0/+58 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-p4: add config git-p4.pathEncoding | Lars Schneider | 2015-09-03 | 1 | -0/+58 |
* | | | | | | | | | Merge branch 'nd/ignore-then-not-ignore' | Junio C Hamano | 2015-10-07 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | dir.c: don't exclude whole dir prematurely if neg pattern may matchnd/ignore-then-not-ignore | Nguyễn Thái Ngọc Duy | 2015-09-21 | 1 | -0/+25 |
* | | | | | | | | | | Sync with 2.6.1 | Junio C Hamano | 2015-10-05 | 8 | -0/+248 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Sync with v2.5.4 | Junio C Hamano | 2015-09-28 | 8 | -0/+248 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Sync with 2.4.10 | Junio C Hamano | 2015-09-28 | 8 | -0/+248 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | Sync with 2.3.10 | Junio C Hamano | 2015-09-28 | 8 | -0/+248 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | http: limit redirection depth | Blake Burkhart | 2015-09-25 | 2 | -0/+7 |
| | | | * | | | | | | | | http: limit redirection to protocol-whitelist | Blake Burkhart | 2015-09-25 | 2 | -0/+10 |
| | | | * | | | | | | | | submodule: allow only certain protocols for submodule fetches | Jeff King | 2015-09-23 | 1 | -0/+43 |
| | | | * | | | | | | | | transport: add a protocol-whitelist environment variable | Jeff King | 2015-09-23 | 6 | -0/+188 |
| | | | |/ / / / / / / | |||||
| | * | | | | | | | | | Merge branch 'dt/untracked-subdir' into maint | Junio C Hamano | 2015-09-17 | 1 | -0/+215 |
| | |\ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ | Merge branch 'bb/remote-get-url' | Junio C Hamano | 2015-10-05 | 1 | -0/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | remote: add get-url subcommandbb/remote-get-url | Ben Boeckel | 2015-09-17 | 1 | -0/+37 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jk/blame-first-parent' | Junio C Hamano | 2015-10-05 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | blame: handle --first-parentjk/blame-first-parent | Jeff King | 2015-09-16 | 1 | -0/+4 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jk/rebase-no-autostash' | Junio C Hamano | 2015-10-05 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | rebase: support --no-autostash | John Keeping | 2015-09-10 | 1 | -0/+10 |
* | | | | | | | | | | | | | Merge branch 'kn/for-each-tag' | Junio C Hamano | 2015-10-05 | 2 | -7/+214 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | tag.c: implement '--merged' and '--no-merged' options | Karthik Nayak | 2015-09-17 | 1 | -0/+27 |
| * | | | | | | | | | | | | tag.c: implement '--format' option | Karthik Nayak | 2015-09-17 | 1 | -0/+12 |
| * | | | | | | | | | | | | tag.c: use 'ref-filter' APIs | Karthik Nayak | 2015-09-17 | 1 | -7/+1 |
| * | | | | | | | | | | | | ref-filter: add support to sort by version | Karthik Nayak | 2015-09-17 | 1 | -0/+36 |
| * | | | | | | | | | | | | ref-filter: add support for %(contents:lines=X) | Karthik Nayak | 2015-09-17 | 1 | -0/+52 |
| * | | | | | | | | | | | | ref-filter: implement an `align` atom | Karthik Nayak | 2015-09-17 | 1 | -0/+82 |
| * | | | | | | | | | | | | ref-filter: introduce match_atom_name() | Karthik Nayak | 2015-09-17 | 1 | -0/+4 |
| * | | | | | | | | | | | | Merge 'jk/git-path' into kn/for-each-tag | Junio C Hamano | 2015-08-24 | 1 | -111/+85 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge 'kn/for-each-tag-branch' into kn/for-each-tag | Junio C Hamano | 2015-08-24 | 1 | -0/+84 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |