Re: emacs.git 'master' reset

On Jul 26 2026, Eli Zaretskii wrote:

>> From: Andreas Schwab <[email protected]>
>> Cc: Sean Whitton <[email protected]>,  [email protected]
>> Date: Sun, 26 Jul 2026 15:39:15 +0200
>> 
>> On Jul 26 2026, Eli Zaretskii wrote:
>> 
>> > But currently "git status" says "ahead 10", presumably because I have
>> > commits from before emacs.git on Savannah was reset.  Won't the
>> > above command lose all those commits?  Or were they already re-pushed?
>> 
>> You can run "git rebase -i" and remove the offending commit from the
>> todo list.
>
> Thanks, but I don't understand what that means.  Which is "the
> offending commit",

The one dropped from master that you still have as you said above.

> and what is the "todo list"?

The list of commits that this interactive rebase presents you for
selection.

> And again, does this mean that everyone must do this now?

That's the reason why such rewriting of published history must be
avoided at all cost.

-- 
Andreas Schwab, [email protected]
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."