From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kyle Meyer Subject: Re: Merge branch 'maint' Date: Wed, 09 Sep 2015 13:30:25 -0400 Message-ID: <87y4gfpkjy.fsf@kyleam.com> References: <87twr37il4.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZjCe-0002M7-UX for emacs-orgmode@gnu.org; Wed, 09 Sep 2015 13:30:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZZjCa-0004P5-00 for emacs-orgmode@gnu.org; Wed, 09 Sep 2015 13:30:36 -0400 Received: from mail-qg0-f53.google.com ([209.85.192.53]:34170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZjCZ-0004Oz-Sy for emacs-orgmode@gnu.org; Wed, 09 Sep 2015 13:30:31 -0400 Received: by qgez77 with SMTP id z77so14050161qge.1 for ; Wed, 09 Sep 2015 10:30:31 -0700 (PDT) In-Reply-To: <87twr37il4.fsf@gmail.com> (Oleh Krehel's message of "Wed, 09 Sep 2015 16:50:15 +0200") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Oleh Krehel Cc: emacs-orgmode@gnu.org Hello, Oleh Krehel 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