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: Stupid git! Date: Sat, 12 Sep 2015 16:12:05 +0200 Message-ID: <874miz6822.fsf@igel.home> References: <20150912101514.GA2322@acm.fritz.box> <877fnvn9nh.fsf@foo.bar.baz> <20150912130255.GF2322@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1442067192 18019 80.91.229.3 (12 Sep 2015 14:13:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 12 Sep 2015 14:13:12 +0000 (UTC) Cc: Giuseppe Scrivano , emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Sep 12 16:13:03 2015 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 1ZalY6-0008U7-Lg for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 16:13:02 +0200 Original-Received: from localhost ([::1]:60928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZalY5-0000ow-Tp for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 10:13:01 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZalXJ-000060-9i for emacs-devel@gnu.org; Sat, 12 Sep 2015 10:12:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZalXE-0005QK-Al for emacs-devel@gnu.org; Sat, 12 Sep 2015 10:12:13 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:48686) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZalXE-0005Pj-4C; Sat, 12 Sep 2015 10:12:08 -0400 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3nCwr63SGlz3hjBG; Sat, 12 Sep 2015 16:12:06 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3nCwr62PvHzvk8v; Sat, 12 Sep 2015 16:12:06 +0200 (CEST) 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 4ucaBEnnkRRk; Sat, 12 Sep 2015 16:12:05 +0200 (CEST) X-Auth-Info: zg3K6S2sC4xveruP+uAegTypqdmf/MpA4S6JCHHeGXPP9n4UtcWbD1eM5ec7h+VL Original-Received: from igel.home (host-188-174-212-64.customer.m-online.net [188.174.212.64]) by mail.mnet-online.de (Postfix) with ESMTPA; Sat, 12 Sep 2015 16:12:05 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 1000) id 226C42C1A06; Sat, 12 Sep 2015 16:12:05 +0200 (CEST) X-Yow: I Know A Joke In-Reply-To: <20150912130255.GF2322@acm.fritz.box> (Alan Mackenzie's message of "Sat, 12 Sep 2015 13:02:55 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (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:189867 Archived-At: Alan Mackenzie writes: > Hello, Giuseppe. > > On Sat, Sep 12, 2015 at 01:45:38PM +0200, Giuseppe Scrivano wrote: >> Have you used --rebase to pull to apply your commits after you pulled >> all the changes from the remote repository? > > No, I didn't. I should have done. I don't think there are any > disadvantages to doing so. `git config pull.rebase true' to make that the default. 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."