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:37:41 +0200 Organization: Probably a good idea Message-ID: 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> <55F48E7F.40602@yandex.ru> <20150912215114.GB3711@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1442227088 21204 80.91.229.3 (14 Sep 2015 10:38:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Sep 2015 10:38:08 +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:37: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 1ZbR94-00082a-LP for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 12:37:58 +0200 Original-Received: from localhost ([::1]:39658 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbR94-0001AP-1W for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 06:37:58 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbR8z-0001AC-NX for emacs-devel@gnu.org; Mon, 14 Sep 2015 06:37:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbR8u-0005Gu-MD for emacs-devel@gnu.org; Mon, 14 Sep 2015 06:37:53 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:53700) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbR8u-0005Go-FB for emacs-devel@gnu.org; Mon, 14 Sep 2015 06:37:48 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1ZbR8s-0007p4-35 for emacs-devel@gnu.org; Mon, 14 Sep 2015 12:37:46 +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:37:46 +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:37:46 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 34 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:jfcWOdAxM/rzaSl34Fou8I0NtSQ= 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:189931 Archived-At: >>>>> Alan Mackenzie : > :-). OK, but the immediate problem is that _I_ didn't modify > file-notify-tests.el. Somebody else did, and git put his changes into > my working directory and `git add'ed it. I don't have the log entry for > this change. Don't worry about it. That log message is in the history of origin/master, and "git log" will display it, and "git blame" will bind the correct modified lines to the git commit. The changes you see, are the changes that has been upstream since your last pull. Your "incoming changes", so to speak. > So am I supposed to just commit this, with my own log entry? Yes, since this is the commit of a merge, git will usually suggest a message for you. I usually go with that, and maybe add some comments on the merges I've resolved. > I don't really understand what "you are still merging" is supposed to > mean. It means that the merge operation in "git pull" needs a "git commit" to complete. > How do I get out of the "merging" state cleanly, "git commit" > without commiting somebody else's changes? You won't be committing somebody else's changes... or rather: you won't be commiting somebody else's changes in a way that will mess up the git history (which is something that _may_ happen when rebase is involved)