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: merging emacs-24 Date: Thu, 27 Nov 2014 18:59:16 +0100 Message-ID: <87sih4tthn.fsf@igel.home> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87y4qx76hh.fsf@lifelogs.com> <87r3wpmmf6.fsf@wanadoo.es> <87oart74q5.fsf@lifelogs.com> <61sih5uww3.fsf@fencepost.gnu.org> <878uiw7q5n.fsf@lifelogs.com> <87r3woa6rd.fsf@engster.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417111186 20313 80.91.229.3 (27 Nov 2014 17:59:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Nov 2014 17:59:46 +0000 (UTC) Cc: emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 27 18:59:38 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 1Xu3Lu-0004ME-3p for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 18:59:38 +0100 Original-Received: from localhost ([::1]:41032 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu3Lt-0008W7-N3 for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 12:59:37 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu3Ll-0008Su-Od for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:59:35 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xu3La-0007IF-R0 for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:59:29 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:42677) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu3La-0007Hu-Km for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:59:18 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3jpRYd3dTmz3hjkD; Thu, 27 Nov 2014 18:59:17 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3jpRYd2Dh1zvkFQ; Thu, 27 Nov 2014 18:59:17 +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 H-nuDaanl7uJ; Thu, 27 Nov 2014 18:59:16 +0100 (CET) X-Auth-Info: lOO3LXD0bwpgtWHkKgd8rHraVky0MMN2f5kgbjcUGBaZRwK/73/owtOA/NXM6Cm6 Original-Received: from igel.home (ppp-188-174-148-81.dynamic.mnet-online.de [188.174.148.81]) by mail.mnet-online.de (Postfix) with ESMTPA; Thu, 27 Nov 2014 18:59:16 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id 49A282C44F2; Thu, 27 Nov 2014 18:59:16 +0100 (CET) X-Yow: Am I SHOPLIFTING? In-Reply-To: <87r3woa6rd.fsf@engster.org> (David Engster's message of "Thu, 27 Nov 2014 18:32:54 +0100") 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: 212.18.0.9 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:178374 Archived-At: David Engster writes: > Ted Zlatanov writes: >> I can't believe I did that. Sorry. It's not harmful, but I was >> careless. I've now added this alias to my gitconfig: > > I think the easiest way to avoid this is to merge the remote branch > instead of the local tracking one. That should always be done anyway, since that makes sure you only merge things that are already pushed. 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."