From: Felipe Contreras <felipe.contreras@gmail.com>
To: Marco Giuliano <marco.giuliano@tesisquare.com>, git@vger.kernel.org
Subject: RE: Nonexistent changes appear rebasing but only with rebase.backend=apply
Date: Fri, 18 Jun 2021 18:44:30 -0500 [thread overview]
Message-ID: <60cd2fded6889_ca711208d7@natae.notmuch> (raw)
In-Reply-To: <CANLwWg4hG=iv9qjOmGHSJ7z7Y+vvvP+x0o3DfR5bH5A-C6_7aQ@mail.gmail.com>
Marco Giuliano wrote:
> This might not be caused by rebase command itself, but rather by some
> previous operations which might have accidentally "broken" something
> and that the rebase simply makes them appear.
> You need to know that commit 4 is the result of several squash and
> reordering of multiple commits; is it possible that some of those
> operations have created some "leftovers" ?
Smells like the reflog.
Have you tried --no-fork-point?
--
Felipe Contreras
next prev parent reply other threads:[~2021-06-18 23:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-18 15:21 Nonexistent changes appear rebasing but only with rebase.backend=apply Marco Giuliano
2021-06-18 23:44 ` Felipe Contreras [this message]
2021-06-20 18:02 ` Phillip Wood
2021-06-24 16:23 ` Marco Giuliano
2021-06-24 18:39 ` Phillip Wood
2021-06-25 7:12 ` Marco Giuliano
2021-06-26 7:53 ` Elijah Newren
2021-06-29 18:58 ` Marco Giuliano
2021-06-25 16:08 ` Felipe Contreras
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=60cd2fded6889_ca711208d7@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=marco.giuliano@tesisquare.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).