From: ch <cr@onlinehome.de>
To: Jeff King <peff@peff.net>
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: [BUG] git-rebase: reword squashes commits in case of merge-conflicts
Date: Fri, 15 Jun 2018 16:35:43 +0200 [thread overview]
Message-ID: <118a8026-7050-dbd2-9f46-31e8db2bac05@onlinehome.de> (raw)
In-Reply-To: <20180612100810.GA27231@sigill.intra.peff.net>
On 12.06.2018 12:08, Jeff King wrote:
> Thanks for a thorough report. I couldn't reproduce it on v2.17.1 on
> Linux, which makes me wonder if the issue is related to git-for-windows
> somehow. To the best of my knowledge (and a quick scan of "git diff"
> results) the code should be the same, though.
I gave native Git version 2.17.1 on Ubuntu 18.04 (no WSL this time) a try
and was able to reproduce the issue outlined in my first email.
In case there is a misunderstanding, when I wrote
On 11.06.2018 18:06, ch wrote:
> After the rebase the 'stuff' branch only has a single commit even though I'd
> expect there to be two according to the instructions that were passed to
> git-rebase.
I actually meant that there's only a single commit exclusively reachable
from 'stuff' after the rebase, i.e.
$ git log stuff ^master
only lists a single commit while there actually should be two unless I'm
missing something.
Sorry for being a bit sloppy in my initial report.
- ch
next prev parent reply other threads:[~2018-06-15 14:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-11 16:06 [BUG] git-rebase: reword squashes commits in case of merge-conflicts ch
2018-06-12 10:08 ` Jeff King
2018-06-15 14:35 ` ch [this message]
2018-06-16 16:08 ` Elijah Newren
2018-06-17 3:36 ` Eric Sunshine
2018-06-17 5:37 ` [PATCH v2] sequencer: do not squash 'reword' commits when we hit conflicts Elijah Newren
2018-06-17 15:04 ` Phillip Wood
2018-06-17 19:28 ` Johannes Schindelin
2018-06-18 10:20 ` Phillip Wood
2018-06-18 15:42 ` Junio C Hamano
2018-06-18 21:42 ` Johannes Schindelin
2018-06-19 10:00 ` [PATCH v2] sequencer: do not squash 'reword' commits when wehit conflicts Phillip Wood
2018-06-19 12:46 ` [PATCH v3] sequencer: do not squash 'reword' commits when we hit conflicts Phillip Wood
2018-06-19 14:29 ` Elijah Newren
2018-06-19 16:59 ` Junio C Hamano
2018-08-23 10:09 ` [PATCH] t/lib-rebase.sh: support explicit 'pick' commands in 'fake_editor.sh' SZEDER Gábor
2018-08-23 16:20 ` Junio C Hamano
2018-08-23 20:53 ` Johannes Schindelin
2018-06-17 18:46 ` [PATCH v2] sequencer: do not squash 'reword' commits when we hit conflicts 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=118a8026-7050-dbd2-9f46-31e8db2bac05@onlinehome.de \
--to=cr@onlinehome.de \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=peff@peff.net \
/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).