From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Sat, 12 Sep 2015 16:37:08 -0400 Message-ID: References: <20150912101514.GA2322@acm.fritz.box> <55F40103.9080300@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1442090251 7293 80.91.229.3 (12 Sep 2015 20:37:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 12 Sep 2015 20:37:31 +0000 (UTC) Cc: Alan Mackenzie , emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Sep 12 22:37:25 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 1ZarY5-00058B-23 for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 22:37:25 +0200 Original-Received: from localhost ([::1]:33654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZarY4-0003cF-BI for ged-emacs-devel@m.gmane.org; Sat, 12 Sep 2015 16:37:24 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZarXs-0003c7-P8 for emacs-devel@gnu.org; Sat, 12 Sep 2015 16:37:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZarXp-0007Uf-JL for emacs-devel@gnu.org; Sat, 12 Sep 2015 16:37:12 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:21007) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZarXp-0007Ub-Ee for emacs-devel@gnu.org; Sat, 12 Sep 2015 16:37:09 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0AyFgA731xV/zi6xEVcgxCEAoVVu0CHSwQCAoE8OhMBAQEBAQEBgQpBBYNdAQEDAVYjBQsLDiYSFBgNJIg3CM8jAQEIAgEfizqFBQeELQEEsz+BRSOEFCKCeAEBAQ X-IPAS-Result: A0AyFgA731xV/zi6xEVcgxCEAoVVu0CHSwQCAoE8OhMBAQEBAQEBgQpBBYNdAQEDAVYjBQsLDiYSFBgNJIg3CM8jAQEIAgEfizqFBQeELQEEsz+BRSOEFCKCeAEBAQ X-IronPort-AV: E=Sophos;i="5.13,465,1427774400"; d="scan'208";a="164654592" Original-Received: from 69-196-186-56.dsl.teksavvy.com (HELO fmsmemgm.homelinux.net) ([69.196.186.56]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 12 Sep 2015 16:37:08 -0400 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id 2F375AE22D; Sat, 12 Sep 2015 16:37:08 -0400 (EDT) In-Reply-To: <55F40103.9080300@yandex.ru> (Dmitry Gutov's message of "Sat, 12 Sep 2015 13:40:03 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:189876 Archived-At: > The fact that git allows pulling after 'git add' sounds like a bug to me, In my experience, git allows pulling before as well as after "git add". The main restriction is that it doesn't let you pull/merge if one of the locally modified files has also been modified in the pulled/merge code. Stefan