On Sun, Dec 9, 2018 at 9:04 PM Thomas Gummerer <t.gummerer@xxxxxxxxx> wrote: > My hope is also that the no-overlay mode could become the new default > in the restore-files command Duy is currently working on. I already wrote something like that in git-restore-files.txt even though the implementation is not there :D There will be a hell of conflicts when the two series enter 'pu' (or even worse, when the third one to update worktree only appears) so I'm going to send the switch-branch/restore-files series out but mostly to gather comments and will rebase once the other series land. (Alternatively I'll split my series and let the switch-branch part land first, may be simpler) -- Duy