1-800-GIT-HELP Reverting a patch

[Andreas Schwab]

On Mai 21 2020, Thomas Koenig wrote:

> Obviously, reverting the already applied patch was a no-op.

Obviously not, since the first revert was partial only.

> I would assume that git noticed that, and could issue a message
> like "applying diff to foo.c failed". patch(1) manages it.

git is not doing a plain patch, it is doing a merge.  It is not unusual
for a merge to have changes that are already present on both sides.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."