[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [O] Merge branch 'maint'
From: |
Oleh Krehel |
Subject: |
Re: [O] Merge branch 'maint' |
Date: |
Thu, 10 Sep 2015 12:48:45 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
Kyle Meyer <address@hidden> writes:
> Hello,
>
> Oleh Krehel <address@hidden> 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?
Oleh
- [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 <=
- 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, 2015/09/11
- 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