Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/delete-modechange-conflict' | Junio C Hamano | 2015-10-30 | 3 | -87/+130 |
|\ | |||||
| * | merge: detect delete/modechange conflictjk/delete-modechange-conflict | Jeff King | 2015-10-26 | 1 | -0/+23 |
| * | t6031: generalize for recursive and resolve strategies | Jeff King | 2015-10-26 | 2 | -56/+77 |
| * | t6031: move triple-rename test to t3030 | Jeff King | 2015-10-26 | 2 | -31/+30 |
* | | Merge branch 'jc/add-u-A-default-to-top' | Junio C Hamano | 2015-10-30 | 2 | -0/+3 |
|\ \ | |||||
| * | | add: simplify -u/-A without pathspecjc/add-u-A-default-to-top | Junio C Hamano | 2015-10-24 | 2 | -0/+3 |
* | | | Merge branch 'ar/clone-dissociate' | Junio C Hamano | 2015-10-30 | 1 | -0/+11 |
|\ \ \ | |||||
| * | | | clone: allow "--dissociate" without referencear/clone-dissociate | Alex Riesen | 2015-10-22 | 1 | -0/+11 |
* | | | | Merge branch 'jk/repository-extension' | Junio C Hamano | 2015-10-26 | 1 | -0/+60 |
|\ \ \ \ | |||||
| * | | | | introduce "preciousObjects" repository extensionjk/repository-extension | Jeff King | 2015-06-24 | 1 | -0/+22 |
| * | | | | introduce "extensions" form of core.repositoryformatversion | Jeff King | 2015-06-24 | 1 | -0/+38 |
* | | | | | Merge branch 'dt/t7063-fix-flaky-test' | Junio C Hamano | 2015-10-26 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | t7063: fix flaky untracked-cache testdt/t7063-fix-flaky-test | David Turner | 2015-10-19 | 1 | -1/+3 |
* | | | | | | Merge branch 'mr/worktree-list' | Junio C Hamano | 2015-10-26 | 1 | -0/+89 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | worktree: add 'list' commandmr/worktree-list | Michael Rappazzo | 2015-10-08 | 1 | -0/+89 |
* | | | | | | Merge branch 'tb/t0027-crlf' | Junio C Hamano | 2015-10-20 | 1 | -34/+157 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t0027: improve test for not-normalized filestb/t0027-crlf | Torsten Bögershausen | 2015-10-12 | 1 | -34/+157 |
* | | | | | | | Merge branch 'ls/p4-test-updates' | Junio C Hamano | 2015-10-20 | 2 | -5/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-p4: skip t9819 test case on case insensitive file systemsls/p4-test-updates | Lars Schneider | 2015-10-12 | 1 | -0/+6 |
| * | | | | | | | git-p4: avoid "stat" command in t9815 git-p4-submit-fail | Lars Schneider | 2015-10-12 | 1 | -5/+2 |
* | | | | | | | | Merge branch 'jk/war-on-sprintf' | Junio C Hamano | 2015-10-20 | 3 | -2/+59 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | init: use strbufs to store paths | Jeff King | 2015-10-05 | 1 | -2/+2 |
| * | | | | | | | | remote-ext: simplify git pkt-line generation | Jeff King | 2015-09-25 | 1 | -0/+28 |
| * | | | | | | | | resolve_ref: use strbufs for internal buffers | Jeff King | 2015-09-25 | 1 | -0/+29 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' | Junio C Hamano | 2015-10-16 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | filter-branch: remove multi-line headers in msg filterjk/filter-branch-use-of-sed-on-incomplete-line | James McCoy | 2015-10-12 | 1 | -0/+14 |
* | | | | | | | | | Merge branch 'ls/p4-lfs' | Junio C Hamano | 2015-10-15 | 2 | -0/+480 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-p4: add Git LFS backend for large file system | Lars Schneider | 2015-10-03 | 1 | -0/+288 |
| * | | | | | | | | | git-p4: add support for large file systems | Lars Schneider | 2015-10-03 | 1 | -0/+192 |
* | | | | | | | | | | Merge branch 'js/gc-with-stale-symref' | Junio C Hamano | 2015-10-15 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | pack-objects: do not get distracted by broken symrefsjs/gc-with-stale-symref | Johannes Schindelin | 2015-10-08 | 1 | -1/+1 |
| * | | | | | | | | | | gc: demonstrate failure with stale remote HEAD | Johannes Schindelin | 2015-10-05 | 1 | -0/+13 |
* | | | | | | | | | | | Merge branch 'js/clone-dissociate' | Junio C Hamano | 2015-10-15 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | clone --dissociate: avoid locking pack filesjs/clone-dissociate | Johannes Schindelin | 2015-10-07 | 1 | -1/+1 |
| * | | | | | | | | | | | t5700: demonstrate a Windows file locking issue with `git clone --dissociate` | Johannes Schindelin | 2015-10-05 | 1 | -0/+21 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'es/worktree-add-cleanup' | Junio C Hamano | 2015-10-15 | 1 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t2026: rename worktree prune testes/worktree-add-cleanup | Michael J Gruber | 2015-10-07 | 1 | -0/+0 |
* | | | | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn' | Junio C Hamano | 2015-10-15 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | rebase-i: loosen over-eager check_bad_cmd check | Matthieu Moy | 2015-10-05 | 1 | -0/+15 |
* | | | | | | | | | | | | | Merge branch 'mm/detach-at-HEAD-reflog' | Junio C Hamano | 2015-10-15 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | status: don't say 'HEAD detached at HEAD'mm/detach-at-HEAD-reflog | Matthieu Moy | 2015-10-02 | 1 | -1/+1 |
| * | | | | | | | | | | | | | t3203: test 'detached at' after checkout --detach | Matthieu Moy | 2015-10-02 | 1 | -0/+13 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | 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 |