Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/war-on-sprintf' | Junio C Hamano | 2015-10-20 |
|\ | |||
| * | init: use strbufs to store paths | Jeff King | 2015-10-05 |
| * | remote-ext: simplify git pkt-line generation | Jeff King | 2015-09-25 |
| * | resolve_ref: use strbufs for internal buffers | Jeff King | 2015-09-25 |
* | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' | Junio C Hamano | 2015-10-16 |
|\ \ | |||
| * | | filter-branch: remove multi-line headers in msg filter | James McCoy | 2015-10-12 |
* | | | Merge branch 'ls/p4-lfs' | Junio C Hamano | 2015-10-15 |
|\ \ \ | |||
| * | | | git-p4: add Git LFS backend for large file system | Lars Schneider | 2015-10-03 |
| * | | | git-p4: add support for large file systems | Lars Schneider | 2015-10-03 |
* | | | | Merge branch 'js/gc-with-stale-symref' | Junio C Hamano | 2015-10-15 |
|\ \ \ \ | |||
| * | | | | pack-objects: do not get distracted by broken symrefs | Johannes Schindelin | 2015-10-08 |
| * | | | | gc: demonstrate failure with stale remote HEAD | Johannes Schindelin | 2015-10-05 |
* | | | | | Merge branch 'js/clone-dissociate' | Junio C Hamano | 2015-10-15 |
|\ \ \ \ \ | |||
| * | | | | | clone --dissociate: avoid locking pack files | Johannes Schindelin | 2015-10-07 |
| * | | | | | t5700: demonstrate a Windows file locking issue with `git clone --dissociate` | Johannes Schindelin | 2015-10-05 |
| |/ / / / | |||
* | | | | | Merge branch 'es/worktree-add-cleanup' | Junio C Hamano | 2015-10-15 |
|\ \ \ \ \ | |||
| * | | | | | t2026: rename worktree prune test | Michael J Gruber | 2015-10-07 |
* | | | | | | Merge branch 'gr/rebase-i-drop-warn' | Junio C Hamano | 2015-10-15 |
|\ \ \ \ \ \ | |||
| * | | | | | | rebase-i: loosen over-eager check_bad_cmd check | Matthieu Moy | 2015-10-05 |
* | | | | | | | Merge branch 'mm/detach-at-HEAD-reflog' | Junio C Hamano | 2015-10-15 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | status: don't say 'HEAD detached at HEAD' | Matthieu Moy | 2015-10-02 |
| * | | | | | | | t3203: test 'detached at' after checkout --detach | Matthieu Moy | 2015-10-02 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'nd/clone-linked-checkout' | Junio C Hamano | 2015-10-15 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | clone: allow --local from a linked checkout | Nguyễn Thái Ngọc Duy | 2015-09-28 |
| * | | | | | | | enter_repo: allow .git files in strict mode | Nguyễn Thái Ngọc Duy | 2015-09-28 |
| * | | | | | | | enter_repo: avoid duplicating logic, use is_git_directory() instead | Nguyễn Thái Ngọc Duy | 2015-09-28 |
| * | | | | | | | t0002: add test for enter_repo(), non-strict mode | Nguyễn Thái Ngọc Duy | 2015-09-28 |
* | | | | | | | | Merge branch 'kn/for-each-branch' | Junio C Hamano | 2015-10-15 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | branch: add '--points-at' option | Karthik Nayak | 2015-09-25 |
| * | | | | | | | | branch.c: use 'ref-filter' APIs | Karthik Nayak | 2015-09-25 |
* | | | | | | | | | Merge branch 'sb/perf-without-installed-git' | Junio C Hamano | 2015-10-15 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t/perf: make runner work even if Git is not installed | Stephan Beyer | 2015-09-25 |
* | | | | | | | | | | Merge branch 'sb/http-flaky-test-fix' | Junio C Hamano | 2015-10-15 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | t5561: get rid of racy appending to logfile | Stephan Beyer | 2015-09-25 |
* | | | | | | | | | | | Merge branch 'jc/fsck-dropped-errors' | Junio C Hamano | 2015-10-15 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | fsck: exit with non-zero when problems are found | Junio C Hamano | 2015-09-23 |
* | | | | | | | | | | | | Merge branch 'ls/p4-translation-failure' | Junio C Hamano | 2015-10-15 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | git-p4: handle "Translation of file content failed" | Lars Schneider | 2015-09-22 |
| * | | | | | | | | | | | | git-p4: add test case for "Translation of file content failed" error | Lars Schneider | 2015-09-22 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'mk/submodule-gitdir-path' | Junio C Hamano | 2015-10-15 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | path: implement common_dir handling in git_pathdup_submodule() | Max Kirillov | 2015-09-14 |
* | | | | | | | | | | | | | Merge branch 'jk/notes-dwim-doc' | Junio C Hamano | 2015-10-14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | notes: correct documentation of DWIMery for notes references | Jacob Keller | 2015-09-22 |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'ls/p4-path-encoding' | Junio C Hamano | 2015-10-07 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | git-p4: add config git-p4.pathEncoding | Lars Schneider | 2015-09-03 |
* | | | | | | | | | | | | | | Merge branch 'nd/ignore-then-not-ignore' | Junio C Hamano | 2015-10-07 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | dir.c: don't exclude whole dir prematurely if neg pattern may match | Nguyễn Thái Ngọc Duy | 2015-09-21 |
* | | | | | | | | | | | | | | | Sync with 2.6.1 | Junio C Hamano | 2015-10-05 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Sync with v2.5.4 | Junio C Hamano | 2015-09-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | Sync with 2.4.10 | Junio C Hamano | 2015-09-28 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |