El dissabte, 22 de febrer de 2020, a les 21:06:00 CET, Sven Brauch va escriure:
> Hi,
>
> On Saturday, 22 February 2020 17:18:31 CET Albert Astals Cid wrote:
> > edit file
> > git commit -a
> > git reset --hard origin/master
> > the file contents are gone.
> >
> > Yes i know that i did a git reset, but up to now kate always kept things for
> > me, so I'm used to do that and then salvage the files i actually wanted to
> > keep.
>
> sorry, I don't understand the purpose of this workflow. You do changes, commit
> them, then discard the commit by going back to origin/master and then commit
> those you *actually* wanted again by salvaging the files from your text
> editor? I probably misunderstood ;)

No, you did not misunderstand, I do weird shit, all i am asking is for my editor to not try to be a smart wannabe-clippy and just do what it's supposed to do, tell me the file has changed and if i want to keep the changes or not.

I'm really fine if i have to enable a non-default option for that.

Cheers,
  Albert

>
> Anyways, if you want to restore the contents of the file to before the reset,
> they are still there:
>
> git checkout HEAD@{1} -- <path/to/file>
>
> That's why kate feels free to reload the file.
>
> Best,
> Sven
>
>
>