From: Sergey Organov <sorganov@gmail.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Sebastian Schuberth <sschuberth@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] docs: Clarify what git-rebase's "--preserve-merges" does
Date: Tue, 31 Mar 2015 12:13:23 +0300 [thread overview]
Message-ID: <87lhidlebw.fsf@javad.com> (raw)
In-Reply-To: <55147D27.1060204@kdbg.org> (Johannes Sixt's message of "Thu, 26 Mar 2015 22:41:59 +0100")
Johannes Sixt <j6t@kdbg.org> writes:
>> Junio C Hamano <gitster@pobox.com> writes:
[...]
> The patch was discussed here:
> http://thread.gmane.org/gmane.comp.version-control.git/198125
>
> The reason that this has not progressed any further is this response
> in the thread:
>
> http://thread.gmane.org/gmane.comp.version-control.git/198125/focus=198483
>
> where you basically say that a --first-parent mode is good, but it
> should be separate from --preserve-merges. I haven't made up my mind,
> yet, how to proceed from there.
As far as I can see, there are 2 separate issues:
1. How to calculate the set of commits to rebase.
2. How to rebase merge commits.
Can we leave (1) for a while at its current state and focus on (2)?
Johannes's patch contains a fix for that: use cherry-pick to recreate
merge commits instead of trying to re-merge. Could this change be
accepted alone, as a known fix for current buggy behavior of loosing
user changes in merge commits?
-- Sergey.
next prev parent reply other threads:[~2015-03-31 9:13 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-26 13:04 [PATCH] docs: Clarify what git-rebase's "--preserve-merges" does Sebastian Schuberth
2015-03-26 18:18 ` Junio C Hamano
2015-03-26 20:28 ` Sebastian Schuberth
2015-03-26 20:55 ` Junio C Hamano
2015-03-26 21:17 ` Sergey Organov
2015-03-26 21:41 ` Johannes Sixt
2015-03-31 9:13 ` Sergey Organov [this message]
2015-03-31 16:28 ` Junio C Hamano
2015-03-31 17:03 ` Sergey Organov
2015-03-31 17:04 ` Junio C Hamano
2015-04-01 11:27 ` Sergey Organov
2015-04-01 17:03 ` Junio C Hamano
2015-04-02 9:53 ` Sergey Organov
2015-03-30 9:29 ` Sebastian Schuberth
2015-03-30 17:23 ` Junio C Hamano
2015-03-30 19:42 ` Sebastian Schuberth
2015-03-30 19:58 ` Junio C Hamano
2015-03-30 20:23 ` Junio C Hamano
2015-03-30 21:09 ` Sebastian Schuberth
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=87lhidlebw.fsf@javad.com \
--to=sorganov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=sschuberth@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 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).