From: Kevin Daudt <me@ikke.info>
To: Nikita Orlov <fatemail@mail.ru>
Cc: git@vger.kernel.org
Subject: Re: git loses a commit after reordering.
Date: Sun, 30 Apr 2017 00:56:42 +0200 [thread overview]
Message-ID: <20170429225642.GA25902@alpha.vpn.ikke.info> (raw)
In-Reply-To: <1493278996.239768474@f402.i.mail.ru>
On Thu, Apr 27, 2017 at 10:43:16AM +0300, Nikita Orlov wrote:
> Hello, my name is Nikita (male).
>
> Could you explain this (subject) is a bug or a feature?
>
> [snip]
>
> "Some independent changes 1" is missed and its changes are missed as well.
>
> I tried to move another commit to a farther distance below but there was still only one missed commit.
>
> Could you explain it?
>
> Thank you in advance and sorry for my English.
>
> Best, Nikita
[man git-rebase][0] mentions this under the bug section:
> The todo list presented by --preserve-merges --interactive does not
> represent the topology of the revision graph. Editing commits and
> rewording their commit messages should work fine, but attempts to
> reorder commits tend to produce counterintuitive results.
Not sure if this is the case here, but it at least confirms that rebase
--preserve-merges was not meant to reorder commits.
See [this][1] thread for more background on this limitation.
[0]:https://git-scm.com/docs/git-rebase#_bugs
[1]:https://public-inbox.org/git/1mtveu4.19lvgi1c0hmhaM%25lists@haller-berlin.de/
next prev parent reply other threads:[~2017-04-29 23:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-27 7:43 git loses a commit after reordering Nikita Orlov
2017-04-29 22:56 ` Kevin Daudt [this message]
2017-05-01 13:04 ` Re[2]: " Nikita Orlov
2017-05-01 23:33 ` Junio C Hamano
2017-05-02 14:29 ` Johannes Schindelin
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=20170429225642.GA25902@alpha.vpn.ikke.info \
--to=me@ikke.info \
--cc=fatemail@mail.ru \
--cc=git@vger.kernel.org \
/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 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 NNTP newsgroup(s).