Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mm/reset-facl-before-umask-test' | Junio C Hamano | 2017-02-02 | 1 | -0/+3 |
|\ | |||||
| * | t0001: don't let a default ACL interfere with the umask testmm/reset-facl-before-umask-test | Matt McCutchen | 2017-01-30 | 1 | -0/+3 |
* | | Merge branch 'js/unzip-in-usr-bin-workaround' | Junio C Hamano | 2017-02-02 | 1 | -1/+3 |
|\ \ | |||||
| * | | test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/js/unzip-in-usr-bin-workaround | Johannes Schindelin | 2017-01-27 | 1 | -1/+3 |
* | | | Merge branch 'js/status-pre-rebase-i' | Junio C Hamano | 2017-02-02 | 1 | -0/+19 |
|\ \ \ | |||||
| * | | | status: be prepared for not-yet-started interactive rebasejs/status-pre-rebase-i | Johannes Schindelin | 2017-01-26 | 1 | -0/+19 |
* | | | | Merge branch 'sb/submodule-add-force' | Junio C Hamano | 2017-02-02 | 1 | -0/+14 |
|\ \ \ \ | |||||
| * | | | | submodule add: extend force flag to add existing repossb/submodule-add-force | Stefan Beller | 2016-11-29 | 1 | -0/+14 |
* | | | | | Merge branch 'jk/fsck-connectivity-check-fix' | Junio C Hamano | 2017-01-31 | 1 | -3/+73 |
|\ \ \ \ \ | |||||
| * | | | | | t1450: use "mv -f" within loose object directory | Jeff King | 2017-01-25 | 1 | -1/+1 |
| * | | | | | fsck: do not fallback "git fsck <bogus>" to "git fsck" | Jeff King | 2017-01-17 | 1 | -0/+11 |
| * | | | | | fsck: tighten error-checks of "git fsck <head>" | Jeff King | 2017-01-17 | 1 | -0/+5 |
| * | | | | | fsck: prepare dummy objects for --connectivity-check | Jeff King | 2017-01-17 | 1 | -2/+27 |
| * | | | | | fsck: report trees as dangling | Jeff King | 2017-01-17 | 1 | -0/+27 |
| * | | | | | t1450: clean up sub-objects in duplicate-entry test | Jeff King | 2017-01-17 | 1 | -1/+3 |
* | | | | | | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-01-31 | 1 | -46/+46 |
|\ \ \ \ \ \ | |||||
| * | | | | | | difftool: retire the scripted version | Johannes Schindelin | 2017-01-19 | 1 | -48/+46 |
| * | | | | | | difftool: add a skeleton for the upcoming builtin | Johannes Schindelin | 2017-01-17 | 1 | -0/+2 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'rs/qsort-s' | Junio C Hamano | 2017-01-31 | 2 | -0/+51 |
|\ \ \ \ \ \ | |||||
| * | | | | | | perf: add basic sort performance test | René Scharfe | 2017-01-23 | 2 | -0/+51 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch 'ls/filter-process' into maint | Junio C Hamano | 2017-01-17 | 2 | -26/+15 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'sb/t3600-cleanup' into maint | Junio C Hamano | 2017-01-17 | 1 | -73/+51 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'sb/unpack-trees-grammofix' into maint | Junio C Hamano | 2017-01-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ls/t0021-fixup' into maint | Junio C Hamano | 2017-01-17 | 1 | -3/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'ak/lazy-prereq-mktemp' into maint | Junio C Hamano | 2017-01-17 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'dt/smart-http-detect-server-going-away' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+52 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'gv/p4-multi-path-commit-fix' into maint | Junio C Hamano | 2017-01-17 | 1 | -1/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ld/p4-compare-dir-vs-symlink' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/push-default-explicit' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/index-pack-wo-repo-from-stdin' into maint | Junio C Hamano | 2017-01-17 | 6 | -43/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/quote-env-path-list-component' into maint | Junio C Hamano | 2017-01-17 | 2 | -0/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/sequencer-abort-safety' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/pull-rebase-ff' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ak/commit-only-allow-empty' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'da/difftool-dir-diff-fix' into maint | Junio C Hamano | 2017-01-17 | 1 | -3/+41 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jb/diff-no-index-no-abbrev' into maint | Junio C Hamano | 2017-01-17 | 7 | -0/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/stash-disable-renames-internally' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/http-walker-limit-redirect' into maint | Junio C Hamano | 2017-01-17 | 4 | -0/+80 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-empty-file-on-lfs' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/worktree-list-fixup' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bw/push-dry-run' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dt/empty-submodule-in-merge' into maint | Junio C Hamano | 2017-01-17 | 2 | -5/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rev-parse-symbolic-parents-fix' into maint | Junio C Hamano | 2017-01-17 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'vp/show-ref-verify-head' | Junio C Hamano | 2017-01-31 | 1 | -0/+42 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show-ref: detect dangling refs under --verify as well | Vladimir Panteleev | 2017-01-23 | 1 | -0/+22 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show-ref: allow -d to work with --verify | Vladimir Panteleev | 2017-01-23 | 1 | -0/+9 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show-ref: accept HEAD with --verify | Vladimir Panteleev | 2017-01-23 | 1 | -0/+11 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/remote-rename-with-half-configured-remote' | Junio C Hamano | 2017-01-31 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remote rename: more carefully determine whether a remote is configuredjs/remote-rename-with-half-configured-remote | Johannes Schindelin | 2017-01-19 | 1 | -1/+1 |