Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'nd/git-common-dir-fix' into maint | Junio C Hamano | 2016-03-10 |
|\ | |||
| * | rev-parse: take prefix into account in --git-common-dir | Nguyễn Thái Ngọc Duy | 2016-02-12 |
* | | Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint | Junio C Hamano | 2016-03-10 |
|\ \ | |||
| * | | get_sha1: don't die() on bogus search strings | Jeff King | 2016-02-10 |
| * | | check_filename: tighten dwim-wildcard ambiguity | Jeff King | 2016-02-10 |
* | | | Merge branch 'jk/epipe-in-async' into maint | Junio C Hamano | 2016-03-10 |
|\ \ \ | |||
| * | | | t5504: handle expected output from SIGPIPE death | Jeff King | 2016-02-25 |
| * | | | test_must_fail: report number of unexpected signal | Jeff King | 2016-02-25 |
* | | | | Merge branch 'ps/config-error' into maint | Junio C Hamano | 2016-03-10 |
|\ \ \ \ | |||
| * | | | | remote: die on config error when setting URL | Patrick Steinhardt | 2016-02-22 |
| * | | | | branch: die on config error when unsetting upstream | Patrick Steinhardt | 2016-02-22 |
| * | | | | branch: report errors in tracking branch setup | Patrick Steinhardt | 2016-02-22 |
* | | | | | Merge branch 'mg/work-tree-tests' into maint | Junio C Hamano | 2016-03-10 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||
| * | | | | tests: rename work-tree tests to *work-tree* | Michael J Gruber | 2016-02-20 |
* | | | | | Merge branch 'js/test-lib-windows-emulated-yes' into maint | Junio C Hamano | 2016-02-17 |
|\ \ \ \ \ | |||
| * | | | | | test-lib: limit the output of the yes utility | Johannes Schindelin | 2016-02-02 |
| | |_|_|/ | |/| | | | |||
* | | | | | Merge branch 'aw/push-force-with-lease-reporting' into maint | Junio C Hamano | 2016-02-17 |
|\ \ \ \ \ | |||
| * | | | | | push: fix ref status reporting for --force-with-lease | Andrew Wheeler | 2016-02-01 |
| |/ / / / | |||
* | | | | | Merge branch 'js/xmerge-marker-eol' into maint | Junio C Hamano | 2016-02-17 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||
| * | | | | merge-file: ensure that conflict sections match eol style | Johannes Schindelin | 2016-01-27 |
| * | | | | merge-file: let conflict markers match end-of-line style of the context | Johannes Schindelin | 2016-01-27 |
* | | | | | Merge branch 'sg/t6050-failing-editor-test-fix' into maint | Junio C Hamano | 2016-02-05 |
|\ \ \ \ \ | |||
| * | | | | | t6050-replace: make failing editor test more robust | SZEDER Gábor | 2016-01-05 |
* | | | | | | Merge branch 'jk/ref-cache-non-repository-optim' into maint | Junio C Hamano | 2016-02-05 |
|\ \ \ \ \ \ | |||
| * | | | | | | resolve_gitlink_ref: ignore non-repository paths | Jeff King | 2016-01-25 |
| | |_|/ / / | |/| | | | | |||
* | | | | | | Merge branch 'js/dirname-basename' into maint | Junio C Hamano | 2016-02-05 |
|\ \ \ \ \ \ | |||
| * | | | | | | t0060: verify that basename() and dirname() work as expected | Johannes Schindelin | 2016-01-12 |
| | |_|/ / / | |/| | | | | |||
* | | | | | | Merge branch 'nd/diff-with-path-params' into maint | Junio C Hamano | 2016-02-05 |
|\ \ \ \ \ \ | |||
| * | | | | | | diff: make -O and --output work in subdirectory | Duy Nguyen | 2016-01-21 |
| |/ / / / / | |||
| * | | | | | Merge branch 'jk/pending-keep-tag-name' into maint | Junio C Hamano | 2016-01-04 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'jk/symbolic-ref-maint' into maint | Junio C Hamano | 2016-01-04 |
| |\ \ \ \ \ \ | |||
* | \ \ \ \ \ \ | Merge branch 'jk/list-tag-2.7-regression' into maint | Junio C Hamano | 2016-02-05 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | tag: do not show ambiguous tag names as "tags/foo" | Jeff King | 2016-01-26 |
| * | | | | | | | | t6300: use test_atom for some un-modern tests | Jeff King | 2016-01-25 |
| | |_|_|/ / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jk/sanity' into maint | Junio C Hamano | 2016-02-05 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | test-lib: clarify and tighten SANITY | Junio C Hamano | 2016-01-19 |
* | | | | | | | | | Merge branch 'jk/filter-branch-no-index' into maint | Junio C Hamano | 2016-02-05 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | filter-branch: resolve $commit^{tree} in no-index case | Jeff King | 2016-01-19 |
* | | | | | | | | | | Merge branch 'js/close-packs-before-gc' into maint | Junio C Hamano | 2016-02-05 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | fetch: release pack files before garbage-collecting | Johannes Schindelin | 2016-01-13 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'nd/exclusion-regression-fix' into maint | Junio C Hamano | 2016-02-05 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Revert "dir.c: don't exclude whole dir prematurely if neg pattern may match" | Nguyễn Thái Ngọc Duy | 2016-01-08 |
* | | | | | | | | | | | Merge branch 'dk/reflog-walk-with-non-commit' into maint | Junio C Hamano | 2016-02-05 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | reflog-walk: don't segfault on non-commit sha1's in the reflog | Dennis Kaarsemaker | 2016-01-05 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | Merge branch 'ls/p4-keep-empty-commits' into maint | Junio C Hamano | 2015-12-15 |
| |\ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/send-email-mutt-alias-fix' into maint | Junio C Hamano | 2016-02-05 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | git-send-email: do not double-escape quotes from mutt | Eric Wong | 2016-01-04 |
* | | | | | | | | | | | | | Merge branch 'nd/stop-setenv-work-tree' into maint | Junio C Hamano | 2016-02-05 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | Revert "setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR" | Nguyễn Thái Ngọc Duy | 2015-12-22 |
* | | | | | | | | | | | | | Merge branch 'sh/p4-multi-depot' | Junio C Hamano | 2015-12-28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |