From: Robert Klein <roklein@roklein.de>
To: Oleh Krehel <ohwoeowho@gmail.com>
Cc: Kyle Meyer <kyle@kyleam.com>, emacs-orgmode@gnu.org
Subject: Re: Merge branch 'maint'
Date: Thu, 10 Sep 2015 17:05:37 +0200 [thread overview]
Message-ID: <20150910170537.26662d40@pckr150.mpip-mainz.mpg.de> (raw)
In-Reply-To: <87lhceo8he.fsf@gmail.com>
Hi,
Oleh Krehel <ohwoeowho@gmail.com> wrote:
> Kyle Meyer <kyle@kyleam.com> writes:
>
> > Hello,
> >
> > Oleh Krehel <ohwoeowho@gmail.com> writes:
> >
> >> Hi all,
> >>
> >> Was the issue of abundant "Merge branch 'maint'" commit messages
> >> discussed before? I couldn't find a reference...
> >>
> >> It's not a big deal, really, but I personally prefer to have linear
> >> history with commits that actually do stuff. And it should be easy
> >> to switch to this style: just use the "rebase" instead of the
> >> "merge" command.
> >>
> >> Anyway, it's a small thing, and if Nicolas or Bastien strongly
> >> like the merge method I won't bring it up again. But if they don't
> >> care either way, I think it's better to start rebasing.
> >
> > While I'm all for rebasing unpushed commits, short-lived feature
> > branches, and throw-away integration branches, your suggestion would
> > frequently rewrite the history of a long-lived public branch.
>
> Why not just cherry-pick the commits from master onto maint, or the
> other way around? That would result in no merge commits.
>
> I think it should be possible to rebase two branches without having to
> rewrite the public history. As far as I understood, maint is a subset
> of master, i.e. all commits that are in maint are in master as well.
> Is that correct?
No.
I agree, the many merge commits in August/September look ugly right
after the 8.3/8.3.1 release. Maint and master will surely diverge more,
now...
Best regards
Robert
next prev parent reply other threads:[~2015-09-10 15:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-09 14:50 Merge branch 'maint' Oleh Krehel
2015-09-09 17:30 ` Kyle Meyer
2015-09-10 10:48 ` Oleh Krehel
2015-09-10 15:05 ` Robert Klein [this message]
2015-09-10 22:26 ` Kyle Meyer
2015-09-11 11:59 ` Oleh Krehel
2015-09-11 12:58 ` Josiah Schwab
2015-09-11 14:32 ` Oleh Krehel
2015-09-11 15:25 ` Stefan Nobis
2015-09-11 16:15 ` Oleh Krehel
2015-09-11 13:40 ` Achim Gratz
2015-09-11 15:24 ` Oleh Krehel
2015-09-15 12:16 ` Nicolas Richard
2015-09-11 13:08 ` Suvayu Ali
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: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150910170537.26662d40@pckr150.mpip-mainz.mpg.de \
--to=roklein@roklein.de \
--cc=emacs-orgmode@gnu.org \
--cc=kyle@kyleam.com \
--cc=ohwoeowho@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://git.savannah.gnu.org/cgit/emacs/org-mode.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).