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: Mon, 14 Sep 2015 16:47:59 +0300 Message-ID: <55F6D00F.5060705@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> <55F48E7F.40602@yandex.ru> <20150912215114.GB3711@acm.fritz.box> <55F5DC69.1040104@yandex.ru> <87h9mxzod7.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1442238510 13232 80.91.229.3 (14 Sep 2015 13:48:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Sep 2015 13:48:30 +0000 (UTC) Cc: Alan Mackenzie , emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Sep 14 15:48:30 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 1ZbU7P-00087K-PF for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 15:48:28 +0200 Original-Received: from localhost ([::1]:40945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbU7P-000223-28 for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 09:48:27 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53225) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbU7I-0001vC-Pd for emacs-devel@gnu.org; Mon, 14 Sep 2015 09:48:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbU7F-0003wm-Gp for emacs-devel@gnu.org; Mon, 14 Sep 2015 09:48:20 -0400 Original-Received: from mail-wi0-x22a.google.com ([2a00:1450:400c:c05::22a]:33715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbU7F-0003wH-AO for emacs-devel@gnu.org; Mon, 14 Sep 2015 09:48:17 -0400 Original-Received: by wiclk2 with SMTP id lk2so141672816wic.0 for ; Mon, 14 Sep 2015 06:48:16 -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=lp/xL7a4HQF2lW0qdxWRJSvnVQJF2iMzcnzG3FBedKk=; b=fd64dI9pEZrFGxM4GoZFeZd8x1Ni+hh+Wyq9DBvbfO563E941eO5wcOtHm9MRX2K26 ZbLJKY6upidv6Exf6TRu2RFIu2/mHvrt8mbLkTzMXbd2ZX1PigOrHVqBy4uYeFYhkvub d065CScUhLaUfl1U//mMyTqj6brEK2oJwvdDDTEQ2dhwwcFEYjExNabdHaxXZi+Qn5LC RXg+CzOkhpY6RulGV41mBgyu/TOKWruATqTnnfuHHC+p54iHrWdy9QYZkpHBVsu6qlud RDk5FxCyJ8SRcc/GWXt8fcN4OVvj+U8yk4HFmGyGD3nhKSZBMslYp6EaQGPLsIANNFZp g2GA== X-Received: by 10.180.109.135 with SMTP id hs7mr27347227wib.12.1442238496689; Mon, 14 Sep 2015 06:48:16 -0700 (PDT) Original-Received: from [10.9.0.103] (nat.webazilla.com. [78.140.128.228]) by smtp.googlemail.com with ESMTPSA id x10sm14501197wiy.6.2015.09.14.06.48.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Sep 2015 06:48:15 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:41.0) Gecko/20100101 Thunderbird/41.0 In-Reply-To: <87h9mxzod7.fsf@uwakimon.sk.tsukuba.ac.jp> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22a 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:189943 Archived-At: On 09/14/2015 06:11 AM, Stephen J. Turnbull wrote: > @Dmitry: Weren't you here for the last "git is a screw" thread? Yes, > he's seen this before. He doesn't understand it yet. It was Richard's thread, and it was quite a while ago. Plenty of time to learn and play around. > > The merge commit shouldn't, generally, include any non-mergy changes, so > > you're not expected to stage any of the files you've been working on, > > before committing. > > @Dmitry: I have no idea what you mean by this, especially not in the > context of helping someone who probably thinks[3] of a merge as > equivalent to I have a feeling that a person that did 'git add xyz' before 'git pull' might try to make xyz a part of the ensuing merge commit. They shouldn't do that. > There should be a file in .git/ named "MERGE_MSG" or something like > that with a preformatted message you can use with the -F option. 'git commit' will pre-fill it for you automatically.