From: Sebastian Schuberth <sschuberth@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: "Martin Ågren" <martin.agren@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: Commit dropped when swapping commits with rebase -i -p
Date: Mon, 11 Sep 2017 10:45:40 +0200 [thread overview]
Message-ID: <a47058cc-8ffc-4484-c247-3c8d4f827c07@gmail.com> (raw)
In-Reply-To: <20170902000417.GE143138@aiede.mtv.corp.google.com>
On 2017-09-02 02:04, Jonathan Nieder wrote:
>> Anyway, this should really more explicitly say *what* you need to know
>> about, that is, reordering commits does not work.
>
> It tries to explain that, even with an example. If you have ideas for
> improving the wording, that would be welcome.
As a first step, I indeed believe the wording must the stronger / clearer. How about this:
From f69854ce7b9359603581317d152421ff6d89f345 Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Mon, 11 Sep 2017 10:41:27 +0200
Subject: [PATCH] docs: use a stronger wording when describing bugs with rebase -i -p
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
---
Documentation/git-rebase.txt | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 6805a74aec..ccd0a04d54 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -782,10 +782,11 @@ case" recovery too!
BUGS
----
-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.
+Be careful when combining the `-i` / `--interactive` and `-p` /
+`--preserve-merges` options. Reordering commits will drop commits from the
+main line. This is because the todo list does not represent the topology of the
+revision graph in this case. However, editing commits and rewording their
+commit messages 'should' work fine.
For example, an attempt to rearrange
------------
--
2.14.1.windows.1
next prev parent reply other threads:[~2017-09-11 8:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-30 10:11 Commit dropped when swapping commits with rebase -i -p Sebastian Schuberth
2017-08-30 18:07 ` Martin Ågren
2017-08-30 18:59 ` Sebastian Schuberth
2017-09-02 0:04 ` Jonathan Nieder
2017-09-11 8:45 ` Sebastian Schuberth [this message]
2017-09-15 20:52 ` Junio C Hamano
2017-09-16 10:41 ` Andreas Heiduk
2017-09-16 13:45 ` Sebastian Schuberth
2017-09-17 13:31 ` Phillip Wood
2017-08-30 20:28 ` Johannes Schindelin
2017-08-30 20:48 ` Sebastian Schuberth
2017-09-01 19:16 ` 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
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=a47058cc-8ffc-4484-c247-3c8d4f827c07@gmail.com \
--to=sschuberth@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=martin.agren@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.
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).