From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Sat, 12 Sep 2015 23:43:43 +0300 Message-ID: <55F48E7F.40602@yandex.ru> References: <20150912101514.GA2322@acm.fritz.box> <877fnvn9nh.fsf@foo.bar.baz> <20150912130255.GF2322@acm.fritz.box> <83egi3brbw.fsf@gnu.org> <20150912203658.GA3711@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1442090662 15186 80.91.229.3 (12 Sep 2015 20:44:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 12 Sep 2015 20:44:22 +0000 (UTC) Cc: gscrivano@gnu.org, emacs-devel@gnu.org To: Alan Mackenzie , Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Sep 12 22:44:17 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 1Zarei-0008Rj-4A for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 22:44:16 +0200 Original-Received: from localhost ([::1]:33667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zareh-0006UK-K9 for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 16:44:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZareW-0006UC-0O for emacs-devel@gnu.org; Sat, 12 Sep 2015 16:44:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZareR-0001wb-25 for emacs-devel@gnu.org; Sat, 12 Sep 2015 16:44:03 -0400 Original-Received: from mail-la0-x22d.google.com ([2a00:1450:4010:c03::22d]:33837) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZareQ-0001wT-RY; Sat, 12 Sep 2015 16:43:58 -0400 Original-Received: by lahg1 with SMTP id g1so36028259lah.1; Sat, 12 Sep 2015 13:43:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=lsn8LhnoYGn2rDYQvwZ5Xfkrd9saygvL8RUD8PT1eUw=; b=XPVnSNPbcolewdEdjkvjbB/3l/MouFk7TgCPnTp+uRWtsZhzjr5AtGLpc9SuPoZewq yCTWvJGoP9zJ/JjhqWuk3xndBcG7Dwx6yNgvWfaudvgNj3JVG7u54vTCGJGuk3dv6v0l gsYkwn2x5+uXd9V/C1sEdYo45DT5UJ8drnLL26U3v6ynHb78aARNoQhMpnySxxVmxrHU IoSYZp8JOBLt4Q2u5xElkv/kpHdk1YFeSP34X89obbR+kWhJYYdSL0itP9jTymEyZy0e hU3z807p/zWn6NlczxLs/NTpxrZK1sxnB0F3sSObKCXBc+jhLf+Mvd20m5OpYJzmehJs sy6w== X-Received: by 10.152.45.97 with SMTP id l1mr5203183lam.113.1442090638195; Sat, 12 Sep 2015 13:43:58 -0700 (PDT) Original-Received: from [192.168.1.190] ([178.252.127.222]) by smtp.googlemail.com with ESMTPSA id j1sm1035368lbc.15.2015.09.12.13.43.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Sep 2015 13:43:57 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:40.0) Gecko/20100101 Thunderbird/40.0 In-Reply-To: <20150912203658.GA3711@acm.fritz.box> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::22d 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:189878 Archived-At: On 09/12/2015 11:36 PM, Alan Mackenzie wrote: > I just did `git pull'. This didn't merge the upstream changes into > my repository. Instead it put the upstream file change into my working > directory, discarding the other contributer's change log. If I > understand correctly, that is. What does 'git status' say? > I think the best thing for me to do now is `git checkout ' to > revert that changed file, If you're in the middle of a merge, it's a recipe for disaster.