From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ingo Lohmar Newsgroups: gmane.emacs.devel Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2] Date: Sun, 03 Apr 2016 13:40:10 +0200 Message-ID: <87lh4uex9h.fsf@acer.localhost.com> References: <20160403111708.GA3537@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1459683636 2643 80.91.229.3 (3 Apr 2016 11:40:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 11:40:36 +0000 (UTC) Cc: Emacs developers To: Alan Mackenzie , Kaushal Modi Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 03 13:40:35 2016 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 1amgOQ-0002UJ-G2 for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 13:40:34 +0200 Original-Received: from localhost ([::1]:52945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amgOP-0006fJ-Up for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 07:40:33 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amgO9-0006fE-GS for emacs-devel@gnu.org; Sun, 03 Apr 2016 07:40:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amgO5-0005mb-GX for emacs-devel@gnu.org; Sun, 03 Apr 2016 07:40:17 -0400 Original-Received: from mail-lb0-x230.google.com ([2a00:1450:4010:c04::230]:34106) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amgO5-0005mX-8k for emacs-devel@gnu.org; Sun, 03 Apr 2016 07:40:13 -0400 Original-Received: by mail-lb0-x230.google.com with SMTP id vo2so121647898lbb.1 for ; Sun, 03 Apr 2016 04:40:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version; bh=CQQrj347Y95YgLMn3d42YRipzBojzZqmHktkd+/Z0/A=; b=Fy/B6DpRET4FZgreVdio7bL80fQUN/l+bwitL42409Uj6bT2DQ6Nc7Pss9do3MvJHS 459cadccUDWjGuvzP8AEzz9w6Gk004VnSpnEam8o9hga4wTyou5OhEBAkchouhcIvyrt 6jYt5zWtyVfJj6mbsE6vvhMxYC7RwkoVNI5ktFROA/r1VJcp/ek++s13L6vr8HXBh9/d WWhGuHsJHmO8lIOlb08dXxXSYSD4iSUf2wjDWL09odxF4s4390ulbDR3jjZwLmcRnrBD H2d/7tooWTZKvN5b+iEYN3Binjnsn6SjCBYnScvXqceAsr4sTsND5zgg1P3Jyi+WuVKR 1RDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references :user-agent:date:message-id:mime-version; bh=CQQrj347Y95YgLMn3d42YRipzBojzZqmHktkd+/Z0/A=; b=DmdX6dRw+TVA6/ysopNFKZFVJ1PEj2mp548DGZyftX0ISbG/CoERiGSIeUObdYnp8W GKlY1Ph4lr00WIGgkYPbfrkYYk7MQvSI65wEQML1lbz702TBqhRJhnTnN3lXfg4mrkyb ohZBzX/j34FIPi217TJL6NvuKCQL8Vvw2Uhm/faj/sDMkrpXUJn4TtaevGPyn6NGZRYL M7zP39WpB8CN69ltKbvukz0LDL+23OlWFtgxA/CbQkERuH3ZMVGnrud6VjmSBdBdtCyL /FZAxiUL6HCEwTnC6CppoDe27j1u8zWG0/B0BB/PlPQ0KpaSaVDOvhm+ppG3jInnCWwg c24Q== X-Gm-Message-State: AD7BkJJ6r6WOk6BiKTVjU0AtZskWHwC/DkBpMMuLFMVUoP3h3imS5myF7uQz28wPIwTVrA== X-Received: by 10.28.53.134 with SMTP id c128mr7068167wma.10.1459683612006; Sun, 03 Apr 2016 04:40:12 -0700 (PDT) Original-Received: from localhost (xdsl-87-79-226-7.netcologne.de. [87.79.226.7]) by smtp.gmail.com with ESMTPSA id x203sm8235325wmg.23.2016.04.03.04.40.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Apr 2016 04:40:11 -0700 (PDT) In-Reply-To: <20160403111708.GA3537@acm.fritz.box> User-Agent: Notmuch/0.20.2+113~g6332e6e (http://notmuchmail.org) Emacs/25.0.90.1 (x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c04::230 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:202613 Archived-At: Hi Alan, On Sun, Apr 03 2016 11:17 (+0000), Alan Mackenzie wrote: > That massive commit happened because of git. I attempted a 'git pull' > prior to making a (moderately small) commit. There was a one-letter > typo in one of my existing files (which I think had been committed). > Because of that, git failed to merge in all the stuff which it had just > fetched from savannah, instead prompting me to do a manual merge, which > I then did. I think 'git pull' has been discussed on this list before. Others feel differently about this issue, but I strongly advise anyone against using 'git pull', and instead suggest you do 'git fetch' (maybe --all). *After* seeing what has happened to the remote branches, you can decide whether a merge or a rebase is in order. Or you spot an unwanted discrepancy, and can fix it, instead of git telling you to manually merge (although admittedly I do not quite follow that part). > It would also be nice if such "pseudo merges" could be handled locally, > rather than being pushed back to the remote repository, causing > confusion. Please note that *all* commits and merges happen locally. The user can only push changes back to the remote by an explicit action, with all intended and unintended effects.