From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: git commit/push and VC Date: Sat, 22 Nov 2014 15:12:45 +0100 Message-ID: <87sihb2ujm.fsf@igel.home> References: <871toysqyq.fsf@rosalinde.fritz.box> <838uj57u5b.fsf@gnu.org> <87ppchd9dk.fsf@Gertrud.fritz.box> <83fvdd612c.fsf@gnu.org> <87h9xttmwa.fsf@uwakimon.sk.tsukuba.ac.jp> <83oas13p1y.fsf@gnu.org> <87egsvu7iw.fsf@uwakimon.sk.tsukuba.ac.jp> <837fyntyy9.fsf@gnu.org> <87vbm7shjx.fsf@uwakimon.sk.tsukuba.ac.jp> <83389bttv8.fsf@gnu.org> <871tov4gki.fsf@igel.home> <83sihbs95r.fsf@gnu.org> <87wq6n2xw9.fsf@igel.home> <83ppcfs60k.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416665601 10991 80.91.229.3 (22 Nov 2014 14:13:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 14:13:21 +0000 (UTC) Cc: stephen@xemacs.org, Stromeko@nexgo.de, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 15:13:14 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XsBR4-0005FL-1k for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 15:13:14 +0100 Original-Received: from localhost ([::1]:45558 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsBR3-0002qR-IP for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 09:13:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55896) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsBQv-0002lM-MZ for emacs-devel@gnu.org; Sat, 22 Nov 2014 09:13:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsBQq-0000FR-RY for emacs-devel@gnu.org; Sat, 22 Nov 2014 09:13:05 -0500 Original-Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:43572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsBQg-0000Cx-7R; Sat, 22 Nov 2014 09:12:50 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3jlGmZ4BX6z3hjqq; Sat, 22 Nov 2014 15:12:46 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3jlGmZ2VfZzvh1l; Sat, 22 Nov 2014 15:12:46 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id NVHC7XChkgVI; Sat, 22 Nov 2014 15:12:45 +0100 (CET) X-Auth-Info: 4/cW9YlaQMlMhJb4oS0GN2g8+pElCWdlpwmwYLFZHXJJEgl1IqFmfEbq+3/xLonS Original-Received: from igel.home (ppp-188-174-148-213.dynamic.mnet-online.de [188.174.148.213]) by mail.mnet-online.de (Postfix) with ESMTPA; Sat, 22 Nov 2014 15:12:45 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 3FB482C4449; Sat, 22 Nov 2014 15:12:45 +0100 (CET) X-Yow: I'm mentally OVERDRAWN! What's that SIGNPOST up ahead? Where's ROD STERLING when you really need him? In-Reply-To: <83ppcfs60k.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 22 Nov 2014 15:45:47 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2001:a60:0:28:0:1:25:1 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 Xref: news.gmane.org gmane.emacs.devel:178007 Archived-At: Eli Zaretskii writes: > Thanks. Just to be sure, the correct merge command should be > > git merge remotes/origin/emacs-24 > > is that right? You can abbreviate it to origin/emacs-24. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."