unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Artur Malabarba <bruce.connor.am@gmail.com>
Cc: "K. Handa" <handa@gnu.org>,
	emacs-diffs@gnu.org, emacs-devel <emacs-devel@gnu.org>
Subject: Re: [Emacs-diffs] master 94ed516 2/4: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Tue, 06 Oct 2015 12:20:21 -0400	[thread overview]
Message-ID: <jwvio6kdl6y.fsf-monnier+emacsdiffs@gnu.org> (raw)
In-Reply-To: <CAAdUY-JUgujDyEPXKFMJAN92bZjbD4ALJVntPVNvLT-OE+BF7Q@mail.gmail.com> (Artur Malabarba's message of "Tue, 6 Oct 2015 10:18:27 +0100")

> Quick question. Could someone explain to me what the subject of this
> email means?
>> master 94ed516 2/4: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
> Is that what you get when you merge the remote's master onto your
> local master?

Yes.

For that reason, it is much better to merge your branch into a clone of
"master" than the other way around.


        Stefan



  parent reply	other threads:[~2015-10-06 16:20 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20151005140014.24070.46905@vcs.savannah.gnu.org>
     [not found] ` <E1Zj6JL-0006Qd-Ij@vcs.savannah.gnu.org>
2015-10-06  9:18   ` master 94ed516 2/4: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Artur Malabarba
2015-10-06 14:09     ` Kaushal Modi
2015-10-06 14:47       ` [Emacs-diffs] " Alan Mackenzie
2015-10-06 14:47       ` Óscar Fuentes
2015-10-06 14:59         ` Kaushal Modi
2015-10-06 15:48           ` David Kastrup
2015-10-06 16:20     ` Stefan Monnier [this message]
2015-10-06 17:01       ` [Emacs-diffs] " Artur Malabarba
2015-10-06 17:25         ` Eli Zaretskii
2015-10-06 20:55           ` Artur Malabarba
2015-10-07 15:06             ` [Emacs-diffs] " Eli Zaretskii

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.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=jwvio6kdl6y.fsf-monnier+emacsdiffs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=bruce.connor.am@gmail.com \
    --cc=emacs-devel@gnu.org \
    --cc=emacs-diffs@gnu.org \
    --cc=handa@gnu.org \
    /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.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).