Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'lf/ref-is-hidden-namespace' | Jeff King | 2015-11-20 |
|\ | |||
| * | t5509: add basic tests for hideRefs | Lukas Fleischer | 2015-11-05 |
* | | Merge branch 'dk/gc-idx-wo-pack' | Jeff King | 2015-11-20 |
|\ \ | |/ |/| | |||
| * | gc: remove garbage .idx files from pack dir | Doug Kelly | 2015-11-04 |
| * | t5304: test cleaning pack garbage | Doug Kelly | 2015-11-04 |
* | | Merge branch 'mk/blame-first-parent' | Junio C Hamano | 2015-11-03 |
|\ \ | |||
| * | | blame: allow blame --reverse --first-parent when it makes sense | Max Kirillov | 2015-10-30 |
| * | | blame: test to describe use of blame --reverse --first-parent | Max Kirillov | 2015-10-30 |
* | | | Merge branch 'rs/wt-status-detached-branch-fix' | Junio C Hamano | 2015-11-03 |
|\ \ \ | |||
| * | | | wt-status: avoid building bogus branch name with detached HEAD | René Scharfe | 2015-11-01 |
| * | | | t7060: add test for status --branch on a detached HEAD | René Scharfe | 2015-11-01 |
* | | | | Merge branch 'js/git-gdb' | Junio C Hamano | 2015-11-03 |
|\ \ \ \ | |||
| * | | | | test: facilitate debugging Git executables in tests with gdb | Johannes Schindelin | 2015-10-30 |
* | | | | | Merge branch 'da/difftool' | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ | |||
| * | | | | | difftool: ignore symbolic links in use_wt_file | David Aguilar | 2015-10-29 |
* | | | | | | Merge branch 'kn/for-each-branch' | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ | |||
| * | | | | | | ref-filter: fallback on alphabetical comparison | Karthik Nayak | 2015-10-30 |
* | | | | | | | Merge branch 'jk/merge-file-exit-code' | Junio C Hamano | 2015-10-30 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | merge-file: clamp exit code to maximum 127 | Jeff King | 2015-10-29 |
* | | | | | | | | Merge branch 'gr/rebase-i-drop-warn' | Junio C Hamano | 2015-10-30 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | rebase-i: work around Windows CRLF line endings | Junio C Hamano | 2015-10-28 |
| * | | | | | | | | t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings | Johannes Schindelin | 2015-10-28 |
* | | | | | | | | | Merge branch 'jk/delete-modechange-conflict' | Junio C Hamano | 2015-10-30 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | merge: detect delete/modechange conflict | Jeff King | 2015-10-26 |
| * | | | | | | | | | t6031: generalize for recursive and resolve strategies | Jeff King | 2015-10-26 |
| * | | | | | | | | | t6031: move triple-rename test to t3030 | Jeff King | 2015-10-26 |
| | |_|_|/ / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jc/add-u-A-default-to-top' | Junio C Hamano | 2015-10-30 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | add: simplify -u/-A without pathspec | Junio C Hamano | 2015-10-24 |
| | |_|/ / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'ar/clone-dissociate' | Junio C Hamano | 2015-10-30 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||
| * | | | | | | | | clone: allow "--dissociate" without reference | Alex Riesen | 2015-10-22 |
* | | | | | | | | | Merge branch 'jk/repository-extension' | Junio C Hamano | 2015-10-26 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | introduce "preciousObjects" repository extension | Jeff King | 2015-06-24 |
| * | | | | | | | | | introduce "extensions" form of core.repositoryformatversion | Jeff King | 2015-06-24 |
* | | | | | | | | | | Merge branch 'dt/t7063-fix-flaky-test' | Junio C Hamano | 2015-10-26 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | t7063: fix flaky untracked-cache test | David Turner | 2015-10-19 |
* | | | | | | | | | | | Merge branch 'mr/worktree-list' | Junio C Hamano | 2015-10-26 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||
| * | | | | | | | | | | worktree: add 'list' command | Michael Rappazzo | 2015-10-08 |
* | | | | | | | | | | | Merge branch 'tb/t0027-crlf' | Junio C Hamano | 2015-10-20 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | t0027: improve test for not-normalized files | Torsten Bögershausen | 2015-10-12 |
* | | | | | | | | | | | | Merge branch 'ls/p4-test-updates' | Junio C Hamano | 2015-10-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | git-p4: skip t9819 test case on case insensitive file systems | Lars Schneider | 2015-10-12 |
| * | | | | | | | | | | | | git-p4: avoid "stat" command in t9815 git-p4-submit-fail | Lars Schneider | 2015-10-12 |
* | | | | | | | | | | | | | 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 |