GNU bug report logs - #68395
30.0.50; ERC 5.6-git: erc-cmd-GMSG, erc-cmd-AMSG, erc-cmd-GME, erc-cmd-AME

Previous Next

Full log

View this message in rfc822 format

From: Emanuel Berg <incal <at> dataswamp.org>
To: 68395 <at> 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

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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.