From: Stefan Nobis <stefan-ml@snobis.de>
To: emacs-orgmode@gnu.org
Subject: Re: Merge branch 'maint'
Date: Fri, 11 Sep 2015 17:25:53 +0200 [thread overview]
Message-ID: <m1wpvx2d1a.fsf@nobis-it.eu> (raw)
In-Reply-To: <87lhcdgh6u.fsf@gmail.com> (Oleh Krehel's message of "Fri, 11 Sep 2015 16:32:25 +0200")
Oleh Krehel <ohwoeowho@gmail.com> writes:
> Would it be so hard for Git to perform a single merge of master into
> maint on release, while keeping them separate and cherry-picking
> in-between for the sake of a clean linear history?
The question is not whether git is capable of doing this (there are
ways to accomplish this goal). The true question is: Do you really
want a linear history?
A linear history may look pretty, but at the same time you loose
information. In a big complex project that is also a dependency to
another complex project, a bit more ugly bookeeping may make
maintenance easier.
--
Until the next mail...,
Stefan.
next prev parent reply other threads:[~2015-09-11 15:26 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
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 [this message]
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=m1wpvx2d1a.fsf@nobis-it.eu \
--to=stefan-ml@snobis.de \
--cc=emacs-orgmode@gnu.org \
/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).