From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Gregory Heytings Newsgroups: gmane.emacs.devel Subject: Re: src/Makefile unhelpful Date: Sun, 18 Sep 2022 16:40:08 +0000 Message-ID: <4d68c253fc6cb7d49ceb@heytings.org> References: <87illl55oa.fsf@gnus.org> <875yhkew4o.fsf@igel.home> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="21746"; mail-complaints-to="usenet@ciao.gmane.io" Cc: =?UTF-8?Q?Gerd_M=C3=B6llmann?= , larsi@gnus.org, eliz@gnu.org, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Sep 18 18:40:51 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oZxLd-0005Tn-SG for ged-emacs-devel@m.gmane-mx.org; Sun, 18 Sep 2022 18:40:50 +0200 Original-Received: from localhost ([::1]:34816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZxLc-0005yX-Oj for ged-emacs-devel@m.gmane-mx.org; Sun, 18 Sep 2022 12:40:48 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:32910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZxL2-0005Bd-NH for emacs-devel@gnu.org; Sun, 18 Sep 2022 12:40:12 -0400 Original-Received: from heytings.org ([95.142.160.155]:45816) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZxL1-0005XR-7U; Sun, 18 Sep 2022 12:40:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20220101; t=1663519208; bh=72fbHG/dFVN6IK1godAWQICzWmdezAs7jgH/FDHxSY0=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=IzfcNf3tQAjM8nwkUIAhv5SyA7/dPzmyaYhUTgWMo3XgN50ZeygPcV+h/SQnuq3Py C+ef8XaQ3gZQLpB1XYihP/E+LVBW6Fqu+EN7UYnxIJ+9LHBvFOwekqKeohRuiHBQsj cYBZfbsL5LxCuvBlWpbvd+AErGTjldfClj/CHYUSwdyaduwL7idrUJrsdBHzN8xosT 7Iz7uvPqzl5t4NrtRGihzOxgM3LikIHD3XuBFwsOHcbjEzlfCMop1KhbJVKT6OryAK Fy3NoHJVdqU+LNeTPSlejww4SLWYdYZ+MQquypOP30gLzpLRCkVXnF7hwwNCuVLOo3 dm3DGt92g3Gvg== In-Reply-To: <875yhkew4o.fsf@igel.home> Received-SPF: pass client-ip=95.142.160.155; envelope-from=gregory@heytings.org; helo=heytings.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:295584 Archived-At: >>> +# !BEWARE! "git clean -fdx" restores the local repository in its >>> +# !BEWARE! pristine state, it deletes all local changes and all >>> +# !BEWARE! untracked files >> >> BTW, I don't think that's true, if local changes means changes to >> git-controlled files. > > Right, git clean is only about untracked files. > Indeed, I meant "to untracked files" with "local changes", that wasn't clear at all. Thanks, fixed. > > To remove changes to tracked files, use git checkout. > No, git checkout doesn't remove changes to tracked files. To remove changes to tracked files, use git reset --hard, or (safer) git stash.