Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'sb/unpack-trees-super-prefix' | Junio C Hamano | 2017-02-03 |
|\ | |||
| * | unpack-trees: support super-prefix option | Stefan Beller | 2017-01-25 |
| * | t1001: modernize style | Stefan Beller | 2017-01-11 |
| * | t1000: modernize style | Stefan Beller | 2017-01-11 |
* | | Merge branch 'nd/log-graph-configurable-colors' | Junio C Hamano | 2017-02-02 |
|\ \ | |||
| * | | color_parse_mem: allow empty color spec | Jeff King | 2017-01-31 |
| * | | log --graph: customize the graph lines with config log.graphColors | Nguyễn Thái Ngọc Duy | 2017-01-23 |
* | | | Merge branch 'mm/reset-facl-before-umask-test' | Junio C Hamano | 2017-02-02 |
|\ \ \ | |||
| * | | | t0001: don't let a default ACL interfere with the umask test | Matt McCutchen | 2017-01-30 |
* | | | | Merge branch 'js/unzip-in-usr-bin-workaround' | Junio C Hamano | 2017-02-02 |
|\ \ \ \ | |||
| * | | | | test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/ | Johannes Schindelin | 2017-01-27 |
* | | | | | Merge branch 'js/status-pre-rebase-i' | Junio C Hamano | 2017-02-02 |
|\ \ \ \ \ | |||
| * | | | | | status: be prepared for not-yet-started interactive rebase | Johannes Schindelin | 2017-01-26 |
* | | | | | | Merge branch 'sb/submodule-add-force' | Junio C Hamano | 2017-02-02 |
|\ \ \ \ \ \ | |||
| * | | | | | | submodule add: extend force flag to add existing repos | Stefan Beller | 2016-11-29 |
* | | | | | | | Merge branch 'jk/fsck-connectivity-check-fix' | Junio C Hamano | 2017-01-31 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t1450: use "mv -f" within loose object directory | Jeff King | 2017-01-25 |
| * | | | | | | | fsck: do not fallback "git fsck <bogus>" to "git fsck" | Jeff King | 2017-01-17 |
| * | | | | | | | fsck: tighten error-checks of "git fsck <head>" | Jeff King | 2017-01-17 |
| * | | | | | | | fsck: prepare dummy objects for --connectivity-check | Jeff King | 2017-01-17 |
| * | | | | | | | fsck: report trees as dangling | Jeff King | 2017-01-17 |
| * | | | | | | | t1450: clean up sub-objects in duplicate-entry test | Jeff King | 2017-01-17 |
* | | | | | | | | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-01-31 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | difftool: retire the scripted version | Johannes Schindelin | 2017-01-19 |
| * | | | | | | | | difftool: add a skeleton for the upcoming builtin | Johannes Schindelin | 2017-01-17 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'rs/qsort-s' | Junio C Hamano | 2017-01-31 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | perf: add basic sort performance test | René Scharfe | 2017-01-23 |
| | |_|_|/ / / / | |/| | | | | | | |||
| * | | | | | | | Merge branch 'ls/filter-process' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'sb/t3600-cleanup' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'sb/unpack-trees-grammofix' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ls/t0021-fixup' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ak/lazy-prereq-mktemp' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dt/smart-http-detect-server-going-away' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'gv/p4-multi-path-commit-fix' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ld/p4-compare-dir-vs-symlink' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/push-default-explicit' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/index-pack-wo-repo-from-stdin' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/quote-env-path-list-component' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/sequencer-abort-safety' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/pull-rebase-ff' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ak/commit-only-allow-empty' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'da/difftool-dir-diff-fix' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jb/diff-no-index-no-abbrev' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/stash-disable-renames-internally' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/http-walker-limit-redirect' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-empty-file-on-lfs' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/worktree-list-fixup' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bw/push-dry-run' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dt/empty-submodule-in-merge' into maint | Junio C Hamano | 2017-01-17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |