[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [O] Merge branch 'maint'
From: |
Stefan Nobis |
Subject: |
Re: [O] Merge branch 'maint' |
Date: |
Fri, 11 Sep 2015 17:25:53 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (darwin) |
Oleh Krehel <address@hidden> 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.
- [O] Merge branch 'maint', Oleh Krehel, 2015/09/09
- Re: [O] Merge branch 'maint', Kyle Meyer, 2015/09/09
- Re: [O] Merge branch 'maint', Oleh Krehel, 2015/09/10
- Re: [O] Merge branch 'maint', Robert Klein, 2015/09/10
- Re: [O] Merge branch 'maint', Kyle Meyer, 2015/09/10
- Re: [O] Merge branch 'maint', Oleh Krehel, 2015/09/11
- Re: [O] Merge branch 'maint', Josiah Schwab, 2015/09/11
- Re: [O] Merge branch 'maint', Oleh Krehel, 2015/09/11
- Re: [O] Merge branch 'maint',
Stefan Nobis <=
- Re: [O] Merge branch 'maint', Oleh Krehel, 2015/09/11
- Re: [O] Merge branch 'maint', Achim Gratz, 2015/09/11
- Re: [O] Merge branch 'maint', Oleh Krehel, 2015/09/11
- Re: [O] Merge branch 'maint', Nicolas Richard, 2015/09/15
- Re: [O] Merge branch 'maint', Suvayu Ali, 2015/09/11