| 2016-04-25 | Sync with maint | blob | diff | raw | |
| 2016-04-25 | Merge branch 'sb/submodule-path-misc-bugs' | blob | diff | raw | |
| 2016-04-25 | Merge branch 'en/merge-trivial-fix' | blob | diff | raw | |
| 2016-04-25 | Merge branch 'en/merge-octopus-fix' | blob | diff | raw | |
| 2016-04-13 | merge-octopus: abort if index does not match HEAD | blob | diff | raw | |
| 2016-04-13 | t6044: new merge testcases for when index doesn't match... | blob | diff | raw | diff to current | |