From: Phillip Susi <phill@thesusis.net>
To: Hongyi Zhao <hongyi.zhao@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: git revert with partial commit.
Date: Mon, 03 Apr 2023 14:29:55 -0400 [thread overview]
Message-ID: <87edp0ak45.fsf@vps.thesusis.net> (raw)
In-Reply-To: <CAGP6POLrtA_9kjCwUbVB8-F+dgQbhz==oy5SsXULfspNj_Umuw@mail.gmail.com>
Hongyi Zhao <hongyi.zhao@gmail.com> writes:
> 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.
next prev parent reply other threads:[~2023-04-03 18:45 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-02 9:17 git revert with partial commit Hongyi Zhao
2023-04-02 14:16 ` Torsten Bögershausen
2023-04-03 17:07 ` Junio C Hamano
2023-04-04 0:28 ` Hongyi Zhao
2023-04-03 18:29 ` Phillip Susi [this message]
2023-04-04 0:20 ` Hongyi Zhao
2023-04-04 0:37 ` Hongyi Zhao
2023-04-04 15:50 ` Hongyi Zhao
2023-04-04 16:19 ` Chris Torek
2023-04-04 17:21 ` Sergey Organov
2023-04-04 18:20 ` Junio C Hamano
2023-04-04 19:40 ` Sergey Organov
2023-04-04 19:48 ` Junio C Hamano
2023-04-04 21:14 ` Felipe Contreras
2023-04-05 6:39 ` Sergey Organov
2023-04-07 0:24 ` Felipe Contreras
2023-04-07 17:20 ` Sergey Organov
2023-04-06 15:48 ` Phillip Susi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87edp0ak45.fsf@vps.thesusis.net \
--to=phill@thesusis.net \
--cc=git@vger.kernel.org \
--cc=hongyi.zhao@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).