From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: git is screwed Date: Mon, 23 Mar 2015 10:56:19 +0100 Message-ID: <550FE343.8010607@math.ntnu.no> References: <20150322154147.GA6808@Tron.local> <20150323045209.GA71859@Tron.local> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1427104631 30036 80.91.229.3 (23 Mar 2015 09:57:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 23 Mar 2015 09:57:11 +0000 (UTC) To: Richard Stallman , Andreas Schwab , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 23 10:56:59 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 1YZz6O-0000wT-9q for ged-emacs-devel@m.gmane.org; Mon, 23 Mar 2015 10:56:56 +0100 Original-Received: from localhost ([::1]:54688 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZz6N-0007Zf-QT for ged-emacs-devel@m.gmane.org; Mon, 23 Mar 2015 05:56:55 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZz69-0007ZM-S1 for emacs-devel@gnu.org; Mon, 23 Mar 2015 05:56:42 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YZz66-0001WQ-LJ for emacs-devel@gnu.org; Mon, 23 Mar 2015 05:56:41 -0400 Original-Received: from hylle05.itea.ntnu.no ([129.241.56.225]:50692) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZz66-0001RE-EU; Mon, 23 Mar 2015 05:56:38 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle05.itea.ntnu.no (Postfix) with ESMTP id CC46390CD44; Mon, 23 Mar 2015 10:56:22 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hylle05.itea.ntnu.no Original-Received: from [129.241.15.191] (dhcp-15191.math.ntnu.no [129.241.15.191]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle05.itea.ntnu.no (Postfix) with ESMTPSA id 30F2790CD43; Mon, 23 Mar 2015 10:56:21 +0100 (CET) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <20150323045209.GA71859@Tron.local> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 129.241.56.225 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:184138 Archived-At: Sam Gwydir wrote: > As far as I know, none. 'git pull' is basically an alias for 'git > fetch; git merge'. Many git users never use pull and always fetch > separately for more control. git pull --ff-only is pretty safe. I have it aliased to up (short for update): ; git config --global alias.up 'git pull --ff-only' ; git help up `git up' is aliased to `pull --ff-only' It will abort the merge if it can't be done using fast-forward. (In other words, if the local branch has diverged from the remote.) =E2=80=93 Harald