From: Erik Cervin Edin <erik@cervined.in>
To: Lemuria <nekadek457@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: Rebasing commits that have been pushed to remote
Date: Sun, 26 Dec 2021 09:44:18 +0100 [thread overview]
Message-ID: <CA+JQ7M_GhE=vcpoCSPEnSPoLA1xZM3uVMuGw4goPe4AmQip2hg@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2021-12-26 8:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-22 7:55 Rebasing commits that have been pushed to remote Lemuria
2021-12-22 19:34 ` Junio C Hamano
2021-12-23 3:11 ` Lemuria
2021-12-26 8:44 ` Erik Cervin Edin [this message]
2021-12-26 9:58 ` Lemuria
2021-12-26 15:49 ` rsbecker
2021-12-27 2:28 ` Lemuria
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CA+JQ7M_GhE=vcpoCSPEnSPoLA1xZM3uVMuGw4goPe4AmQip2hg@mail.gmail.com' \
--to=erik@cervined.in \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nekadek457@gmail.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.