emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Kaushal Modi <kaushal.modi@gmail.com>
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: emacs-org list <emacs-orgmode@gnu.org>
Subject: Re: Minor addition to Speed Keys info node
Date: Thu, 08 Jun 2017 10:02:55 +0000	[thread overview]
Message-ID: <CAFyQvY1Uic8MsVJxCXNhEz+Lz=2wvQ3Q=x9TAQX9YJp0Uy==5A@mail.gmail.com> (raw)
In-Reply-To: <87y3t3xv9a.fsf@nicolasgoaziou.fr>

[-- Attachment #1: Type: text/plain, Size: 711 bytes --]

On Wed, Jun 7, 2017, 6:56 PM Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:

> Why would you? It is a good habit to merge maint into master after
> a patch.


Just because I cannot always be sure that all the commits made by someone
else in maint branch are applicable in master branch too.

I didn't do it for my own commit because I'm about to commit
> something else and wanted to reduce a bit the number of merge commits.


Thanks, that makes sense.

So typically one wouldn't come across a decision point if they should or
shouldn't merge the maint branch commits made by someone else.

And in the case there are commits that should not be merged to master, you
just cherry-pick, right?
-- 

Kaushal Modi

[-- Attachment #2: Type: text/html, Size: 1325 bytes --]

  reply	other threads:[~2017-06-08 10:03 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-07 15:39 Minor addition to Speed Keys info node Kaushal Modi
2017-06-07 15:40 ` Kaushal Modi
2017-06-07 16:21 ` Nicolas Goaziou
2017-06-07 16:32   ` Kaushal Modi
2017-06-07 17:23     ` Kaushal Modi
2017-06-07 20:21       ` Nicolas Goaziou
2017-06-07 20:44         ` Kaushal Modi
2017-06-07 20:55           ` Kaushal Modi
2017-06-07 21:34             ` Nicolas Goaziou
2017-06-07 22:48               ` Kaushal Modi
2017-06-07 22:56                 ` Nicolas Goaziou
2017-06-08 10:02                   ` Kaushal Modi [this message]
2017-06-08 10:50                     ` Nicolas Goaziou
2017-06-08 12:02                       ` Kaushal Modi

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='CAFyQvY1Uic8MsVJxCXNhEz+Lz=2wvQ3Q=x9TAQX9YJp0Uy==5A@mail.gmail.com' \
    --to=kaushal.modi@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=mail@nicolasgoaziou.fr \
    /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).