From: Sergey Organov <sorganov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Sebastian Schuberth <sschuberth@gmail.com>,
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: Fri, 27 Mar 2015 00:17:48 +0300 [thread overview]
Message-ID: <871tkblapv.fsf@javad.com> (raw)
In-Reply-To: <xmqqd23vzkon.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Thu, 26 Mar 2015 11:18:48 -0700")
Junio C Hamano <gitster@pobox.com> writes:
[...]
> I think the current preserve-merges considers everything between
> <upstream> and <branch> as "commits to be rebased", and recreate
> merges across these rebased tips of branches that are merged.
>
> There however were repeated wishes (or wishful misunderstandings ;-)
> that there were a mode to rebuild the trunk, considering only the
> commits on the first-parent chain as "commits to be rebased",
> recreating the history by replaying the merge commits (whose first
> parent might be rewritten during the rebase, but the tips of side
> branches these merges bring into the history are kept intact).
>
> Surely there is no such mode right now,
Isn't it what Johannes Sixt <j6t@kdbg.org> mentions here?:
[QUOTE]
If you want a version of --preserve-merges that does what *you* need,
consider this commit:
git://repo.or.cz/git/mingw/j6t.git rebase-p-first-parent
Use it like this:
git rebase -i -p --first-parent ...
Beware, its implementation is incomplete: if the rebase is interrupted,
then 'git rebase --continue' behaves as if --first-parent were not given.
[/QUOTE].
ref: http://permalink.gmane.org/gmane.comp.version-control.git/263584
If so, then I'd say such mode almost exists.
> but I am fairly sure that I wouldn't have any objection against a
> patch to implement such a feature (perhaps "--first-parent
> --preserve-merges"?),
It'd be very welcome feature here, preferably along with a way to pass
it to 'git pull --rebase', including a way to configure it to be the
default.
> and with or without such a feature in the system, I would be happier
> if we made sure that the description we are discussing to update makes
> it clear that the current behaviour is "everything between <upstream>
> and <branch>", and cannot be misread as "do not touch side branches
> instead of dropping merged commits".
I'd also suggest to somehow warn in the manual that current modes of
operation silently drop changes to merge commits that were made to
non-conflicting paths (either during conflict resolution or otherwise.)
-- Sergey.
next prev parent reply other threads:[~2015-03-26 21:26 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 [this message]
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=871tkblapv.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).