From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Mon, 14 Sep 2015 12:09:33 +0200 Organization: Probably a good idea Message-ID: References: <20150912101514.GA2322@acm.fritz.box> <55F40103.9080300@yandex.ru> <20150912122900.GC2322@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1442225397 26146 80.91.229.3 (14 Sep 2015 10:09:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Sep 2015 10:09:57 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Sep 14 12:09:51 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 1ZbQhq-0004wV-D5 for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 12:09:50 +0200 Original-Received: from localhost ([::1]:39560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbQhp-0002CC-VS for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 06:09:50 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41124) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbQhl-00028H-73 for emacs-devel@gnu.org; Mon, 14 Sep 2015 06:09:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbQhh-0000Ln-4l for emacs-devel@gnu.org; Mon, 14 Sep 2015 06:09:45 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:51852) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbQhg-0000Ko-UY for emacs-devel@gnu.org; Mon, 14 Sep 2015 06:09:41 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1ZbQhf-0004kA-6Z for emacs-devel@gnu.org; Mon, 14 Sep 2015 12:09:39 +0200 Original-Received: from rainey.bang.priv.no ([212.110.185.190]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 14 Sep 2015 12:09:39 +0200 Original-Received: from sb by rainey.bang.priv.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 14 Sep 2015 12:09:39 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 16 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: rainey.bang.priv.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:37xj3k1CbPPzgs0q5ReQRhf5AI0= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:189928 Archived-At: >>>>> Alan Mackenzie : >> But in general, you either 'git stage' and then 'git pull', or 'git >> add', 'git commit' (!), and then either rebase or merge upstream. > It's when first doing `git add', then `git pull' when I've lost changes > before. It happens sometimes, when you stash files that have been staged with "git add". It happened to me once (when I was trying to disprove Alan's claims earlier) but I have been unable to reproduce it since. If someone can get a reproducible case, it would be a good idea to make a bug report with the case to git.