Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
overlayworkingctx: add _manifest, files(), added(), removed(), modified()
|
Fri, 08 Dec 2017 12:14:38 -0800 |
Phil Cohen |
rebase: rerun a rebase on-disk if IMM merge conflicts arise
|
Thu, 07 Dec 2017 22:35:43 -0800 |
Phil Cohen |
rebase: add concludememorynode(), and call it when rebasing in-memory
|
Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
rebase: pass the wctx object (IMM or on-disk) to merge.update
|
Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
rebase: do not update if IMM; instead, set the overlaywctx's parents
|
Thu, 07 Dec 2017 16:07:06 -0800 |
Phil Cohen |
rebase: pass wctx to rebasenode()
|
Sat, 09 Dec 2017 00:39:15 +0900 |
Yuya Nishihara |
check-code: allow tabs in heredoc
|