Tree
- Tree:
a65f84e5b606dcb1f787a7d803d82fbdb24c4c03
- Date:
- Message:
- Implement fast-forward merges. Split part of got_worktree_merge_prepare into a new function, got_worktree_merge_write_refs, since that part doesn't make sense in the fast-forward case. ok stsp@
Makefile | commits | blame |
parse.y | commits | blame |
template.1 | commits | blame |
template.7 | commits | blame |
template.c | commits | blame |
tmpl.c | commits | blame |
tmpl.h | commits | blame |