From: Emanuel Berg <incal@dataswamp.org>
To: 68395@debbugs.gnu.org
Subject: bug#68395: 30.0.50; ERC 5.6-git: erc-cmd-GMSG, erc-cmd-AMSG, erc-cmd-GME, erc-cmd-AME
Date: Fri, 12 Jan 2024 07:53:34 +0100 [thread overview]
Message-ID: <87y1cvujo1.fsf@dataswamp.org> (raw)
In-Reply-To: <87h6jjw58t.fsf@dataswamp.org>
J.P. wrote:
> Both vc and Magit should have tools for helping with this. Assuming
> "[PATCH] `erc-cmd-GMSG' ..." sits on HEAD, you'd do something like this
> in manual Git:
>
> 1. $ git reset --patch @^
> 2. Mark all offending hunks as "y" in the interactive menu
> 3. $ git restore '*'
> 4. $ git commit --amend
> 5. Provide a commit message that accords with CONTRIBUTE
>
> Or, alternatively:
>
> 1. $ git revert @
> 2. Reinstate only the intended changes, which I think I've found below
> 3. $ git add -A
> 4. $ git commit --amend
> 5. Replace generated message
Maybe better to redo the whole thing?
Since the patches produced after these steps (both methods)
also include data on the whitespace.
--
underground experts united
https://dataswamp.org/~incal
prev parent reply other threads:[~2024-01-12 6:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-12 4:22 bug#68395: 30.0.50; ERC 5.6-git: erc-cmd-GMSG, erc-cmd-AMSG, erc-cmd-GME, erc-cmd-AME Emanuel Berg
2024-01-12 5:34 ` J.P.
2024-01-12 5:52 ` Emanuel Berg
2024-01-12 10:49 ` Emanuel Berg
2024-01-19 2:53 ` J.P.
[not found] ` <87v87qowym.fsf@neverwas.me>
2024-01-22 8:23 ` Emanuel Berg
2024-01-12 6:53 ` Emanuel Berg [this message]
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: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y1cvujo1.fsf@dataswamp.org \
--to=incal@dataswamp.org \
--cc=68395@debbugs.gnu.org \
/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://git.savannah.gnu.org/cgit/emacs.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).