On Sat, Jun 29, 2019 at 11:18 PM Edmundo Carmona Antoranz <eantoranz@xxxxxxxxx> wrote: > > --- > wt-status.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ > wt-status.h | 1 + > 2 files changed, 44 insertions(+), 6 deletions(-) > I bet there are more things to do... like: - what happens if the user runs git checkout --force some-branch? The state file has to be deleted, right? - what should happen on the reflog when there's the merge then reset? Is it possible to control what will show up on the reflog from the script? So any guiding word on the things I should take a look at would be greatly appreciated.