git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Rebasing commits that have been pushed to remote

From
EEErik Cervin Edin <erik@cervined.in>
Date
Dec 26, 2021, 08:44 UTC
Message-ID
<CA+JQ7M_GhE=vcpoCSPEnSPoLA1xZM3uVMuGw4goPe4AmQip2hg@mail.gmail.com>
In-Reply-To
<d51b7981-5034-b34c-42d6-ad8b80a378c1@gmail.com>
> Alright. I'll take this into account. Unfortunately, before you got to
> me, I reworded the commits on my local and pushed them to the remote,
> which resulted in a messy history with duplicate comments.

This easily happens Usually when you merge old history back onto rewritten history It's easy to confuse what is what when rewriting history

If you find yourself rewriting and force pushing a lot
you might find the following script helpful
https://gist.github.com/CervEdin/2e72388c3f7d9b30d961ec3b64d08761
It shows:
- The graphs of differences between local and upstream of a branch
- The difference between local and upstream
- Prompts to force push with lease
> But at least my GitHub page has more green on it!

If you want green you can fork https://github.com/cervEdin/vanity

Previous: LemuriaNext: Lemuria
Message 4 of 7 in “Rebasing commits that have been pushed to remote”
  1. LemuriaDec 22, 2021
  2. Junio C HamanoDec 22, 2021
  3. LemuriaDec 23, 2021
  4. Erik Cervin EdinDec 26, 2021
  5. LemuriaDec 26, 2021
  6. rsbecker@nexbridge.comDec 26, 2021
  7. LemuriaDec 27, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.