Re: git revert with partial commit.

From: Phillip Susi <phill@thesusis.net>
Date: Apr 3, 2023, 18:29 UTC
Message-ID: <87edp0ak45.fsf@vps.thesusis.net>
In-Reply-To: <CAGP6POLrtA_9kjCwUbVB8-F+dgQbhz==oy5SsXULfspNj_Umuw@mail.gmail.com>

Hongyi Zhao <hongyi.zhao@gmail.com> writes:

Show 20 quoted lines

> Hi here,
>
> I want to revert a previous commit partially, as follows:
>
> werner@X10DAi:~$ git log |grep -A3 -B5 -m1 texstudio
> commit f18fbd1e16a1ca4215621768d17858c036086608
> Author: Hongyi Zhao <hongyi.zhao@gmail.com>
> Date:   Sun Aug 1 20:01:02 2021 +0800
>
>     deleted:    Public/CTAN/IDE/phonon/compile-install-phonon
>     deleted:    Public/CTAN/IDE/texstudio-org/texstudio.git.sh
>     modified:   Public/repo/github.com/Dushistov/sdcv.git.sh
>     deleted:    Public/repo/github.com/goldendict/stardict-relative/bigdict
>
> More specifically, I just want to revert the following ones:
>
>     deleted:    Public/CTAN/IDE/phonon/compile-install-phonon
>     deleted:    Public/CTAN/IDE/texstudio-org/texstudio.git.sh
>
> Is this possible?

If you are comfortable with git-gui and gitk, then I would say just revert it, then click ammend the previous commit in git-gui, and click to unstage the changes you DON'T want to revert, then commit. If you want to do it from the command line, then git-revert, then git checkout HEAD~1 -- ( the other 4 file names here ) will get back the other 4 files then you can git commit --amend. Alternatively you can skip git-revert and instead git checkout f18fbd1e16~1 -- (the two files that you DO want to revert), then git commit.