From: Junio C Hamano <gitster@pobox•com>
To: Sebastian Schuberth <sschuberth@gmail•com>
Cc: Git Mailing List <git@vger•kernel.org>, Johannes Sixt <j6t@kdbg•org>
Subject: Re: [PATCH] docs: Clarify what git-rebase's "--preserve-merges" does
Date: Thu, 26 Mar 2015 13:55:29 -0700 [thread overview]
Message-ID: <xmqqoanfxyv2.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <55146BF5.7040008@gmail.com> (Sebastian Schuberth's message of "Thu, 26 Mar 2015 21:28:37 +0100")
Sebastian Schuberth <sschuberth@gmail•com> writes:
>> Instead of flattening the history by replaying each
>> non-merge commit to be rebased, preserve the shape of the
>> rebased history by recreating merge commits as well.
>>
>> or something along that line, perhaps?
>
> Hm, I'm not sure about the "as well" here. Non-merge commits basically
> are just picked, not recreated in the same sense as merge
> commits. I'll come up with another proposal.
OK. I do not see qualitative difference between picking a non-merge
and picking a merge; they are both being replayed and it is not like
the machiery is trying to preserve an evil merge. Having said that,
I do not have a strong feeling either way between keeping and
dropping that "as well". I threw it in there only to contrast the
preserve mode (where merges are also picked) with the normal mode
(where merges are not picked).
next prev parent reply other threads:[~2015-03-26 20:55 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 [this message]
2015-03-26 21:17 ` Sergey Organov
2015-03-26 21:41 ` Johannes Sixt
2015-03-31 9:13 ` Sergey Organov
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=xmqqoanfxyv2.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=j6t@kdbg$(echo .)org \
--cc=sschuberth@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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