emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [O] Merge branch 'maint'


From: Kyle Meyer
Subject: Re: [O] Merge branch 'maint'
Date: Wed, 09 Sep 2015 13:30:25 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux)

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.

--
Kyle



reply via email to

[Prev in Thread] Current Thread [Next in Thread]