From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Artur Malabarba Newsgroups: gmane.emacs.devel,gmane.emacs.diffs Subject: Re: [Emacs-diffs] master 94ed516 2/4: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Tue, 6 Oct 2015 18:01:18 +0100 Message-ID: References: <20151005140014.24070.46905@vcs.savannah.gnu.org> Reply-To: bruce.connor.am@gmail.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a11c3ccaa24d12b0521729467 X-Trace: ger.gmane.org 1444151133 5517 80.91.229.3 (6 Oct 2015 17:05:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 6 Oct 2015 17:05:33 +0000 (UTC) Cc: Kenichi Handa , emacs-diffs@gnu.org, emacs-devel To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 06 19:05:32 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from eggs.gnu.org ([208.118.235.92]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZjVgB-0007WA-VV for ged-emacs-devel@m.gmane.org; Tue, 06 Oct 2015 19:05:32 +0200 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjVfx-0007tl-14 for ged-emacs-devel@m.gmane.org; Tue, 06 Oct 2015 13:05:31 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, HTML_MESSAGE,T_DKIM_INVALID,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:53952) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjVfw-0007rH-LR for ged-emacs-devel@m.gmane.org; Tue, 06 Oct 2015 13:05:16 -0400 Original-Received: from localhost ([::1]:52696 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjVfw-0001Qa-3m for ged-emacs-devel@m.gmane.org; Tue, 06 Oct 2015 13:05:16 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjVcC-00066V-EY for emacs-devel@gnu.org; Tue, 06 Oct 2015 13:01:25 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjVcB-0005Xu-BE for emacs-devel@gnu.org; Tue, 06 Oct 2015 13:01:24 -0400 Original-Received: from mail-la0-x231.google.com ([2a00:1450:4010:c03::231]:35675) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjVc7-0005Us-RJ; Tue, 06 Oct 2015 13:01:19 -0400 Original-Received: by lacdq7 with SMTP id dq7so5616428lac.2; Tue, 06 Oct 2015 10:01:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:sender:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=MRr+f8803cdeh8aWRk9e9SlbrA+2NMsKxtxCc3wy1bU=; b=XlL7BrvV//yTpEgerYq4DoaiDnjTcJewlyrY8WUBbRiVOWEbGsHZCDgoSgToeivDGX nLXPK8aXxeSP7fBrpOnxoBEySgqsz2yNgYVf1fD6aHolzgTJM/YNNRCBV3MJUXaBWTtj PzP7XCZHEghfuNDVaPecxPJAwy7yHqWF9msov4c3EM9UNh1xmmglJSv6SIGtBOUmYMfK rgM9vWJjUucMYJ3u+90s5CLleH+UUE+QmT2I0HOMM1+r3HjXtB/O1G/pNTDbiP5N4/eg MjY/Iqjz4W3NEpLEkR/wzmSIhNV407zh8gjbSnnEayfAVaNGHLPevSq4zGcxaKspMPe9 JorQ== X-Received: by 10.112.184.137 with SMTP id eu9mr15147654lbc.21.1444150878980; Tue, 06 Oct 2015 10:01:18 -0700 (PDT) Original-Received: by 10.25.27.78 with HTTP; Tue, 6 Oct 2015 10:01:18 -0700 (PDT) Original-Received: by 10.25.27.78 with HTTP; Tue, 6 Oct 2015 10:01:18 -0700 (PDT) In-Reply-To: X-Google-Sender-Auth: XNDT1wcAjFdBP5RRdYd7Gg7HWUI X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 Xref: news.gmane.org gmane.emacs.devel:191018 gmane.emacs.diffs:131969 Archived-At: --001a11c3ccaa24d12b0521729467 Content-Type: text/plain; charset=UTF-8 On 6 Oct 2015 5:20 pm, "Stefan Monnier" wrote: > > > 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. Yes. Doing your work on a separate dev branch (and pulling master before merging dev onto master) is an important piece of git workflow. Perhaps we ought to document that in the same place we teach people to clone the repo? --001a11c3ccaa24d12b0521729467 Content-Type: text/html; charset=UTF-8


On 6 Oct 2015 5:20 pm, "Stefan Monnier" <monnier@iro.umontreal.ca> wrote:
>
> > 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.

Yes. Doing your work on a separate dev branch (and pulling master before merging dev onto master) is an important piece of git workflow. Perhaps we ought to document that in the same place we teach people to clone the repo?

--001a11c3ccaa24d12b0521729467--