From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Yuri Khan Newsgroups: gmane.emacs.devel Subject: Re: Changes not staged for commit with current master Date: Mon, 7 Aug 2017 16:26:42 +0700 Message-ID: References: <59881DE2.9090708@gmx.at> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1502098036 21041 195.159.176.226 (7 Aug 2017 09:27:16 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 7 Aug 2017 09:27:16 +0000 (UTC) Cc: emacs-devel To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Aug 07 11:27:12 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1deeJX-0004xS-9e for ged-emacs-devel@m.gmane.org; Mon, 07 Aug 2017 11:27:07 +0200 Original-Received: from localhost ([::1]:36198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1deeJd-00056A-54 for ged-emacs-devel@m.gmane.org; Mon, 07 Aug 2017 05:27:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1deeJW-00055E-CY for emacs-devel@gnu.org; Mon, 07 Aug 2017 05:27:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1deeJV-0003By-6J for emacs-devel@gnu.org; Mon, 07 Aug 2017 05:27:06 -0400 Original-Received: from mail-it0-x229.google.com ([2607:f8b0:4001:c0b::229]:34946) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1deeJV-0003BN-1q for emacs-devel@gnu.org; Mon, 07 Aug 2017 05:27:05 -0400 Original-Received: by mail-it0-x229.google.com with SMTP id 76so1066811ith.0 for ; Mon, 07 Aug 2017 02:27:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-transfer-encoding; bh=gszRrBC3Cf2YPKCvIvWdUa2NqGTy0D+31XxB0bMBSqI=; b=ut8dlxEPRox8YGnzHRV62YKhRcQIG6BMfCdB23bs7REKQ50GoCN2f/3MyX+Wc57U+m T2PDKyOFfG1LAOu8eegD7cz04VIKs4WKjj+NP2pP9VAQ4hsHr4PE/pPTVMCCH6bpS3Dc 9/aOUhgTFnYLWvclS6aySDK+ECbcRANReb1voqL+J0IAKyc21jqG2PXB4RxCkTA7y1xQ kqJHsktDU4kqoCBMu0FRc0poOBZ49MKgIJ+aCKVF1Vak8mPt6gNxLdts2w/TedfpB9mM AZc9Rr3pIe9cA4L9Ovj+KiOXzjwtNKov2t5lo/LiRCBPmAwFIZlN3KWiq7lSenQSI8/a 3SnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-transfer-encoding; bh=gszRrBC3Cf2YPKCvIvWdUa2NqGTy0D+31XxB0bMBSqI=; b=VZox95Sk/tEUJI8L1M0p06V6/MUXnhrJ+CSoWytDHd/fe86UuO5AJ5oNTTJU26u6WS DxcT1kI2aMkw9EF9zuGL3Pp+ooLDfEkj3re0jpK7paMsbsd1aDjEDOJhymNXvkP0QI5u NJcOKBjG3lAk55luao3NL3LQ73xB5EIjUZXdoL/jbdwvmMrMmCsH0L57eqPO5NVTy9iK WJLQb01lbCgX8mhj6Wi4Ke3wIYPFmvCKfgBRcDEpE/9zOZ0cMz5SUjegbmflJh4c/Yz8 QcxenHR4kLBO4f3LzG9hLRQjEMD+bFq39UmcyvXbWrJZIOPDblcVLxe0fmxKWVkDvbjR Y2Vw== X-Gm-Message-State: AHYfb5hiqbJe8o1Hra1beyp7BhRVvWJ/Pj2RP2Nx3DGMjtuL9YNIHtS/ lFu8TosPMFo96CmvQdms7cu8UFPpAg== X-Received: by 10.36.236.5 with SMTP id g5mr223230ith.49.1502098022854; Mon, 07 Aug 2017 02:27:02 -0700 (PDT) Original-Received: by 10.79.128.213 with HTTP; Mon, 7 Aug 2017 02:26:42 -0700 (PDT) In-Reply-To: <59881DE2.9090708@gmx.at> X-Google-Sender-Auth: c4uzEEdrnM2PJdlu3yjC0id1VTc X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4001:c0b::229 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:217357 Archived-At: On Mon, Aug 7, 2017 at 2:59 PM, martin rudalics wrote: > git status for master currently tells me > > Changes not staged for commit: > (use "git add/rm ..." to update what will be committed) > (use "git checkout -- ..." to discard changes in working director= y) > > deleted: src/bitmaps/README [=E2=80=A6] > deleted: src/bitmaps/stipple.xbm Git is saying that your working tree is missing several files that are present in the repository revision. > What am I supposed to do with them? Depends on what you want to achieve. If you want to author a commit that deletes these files: =E2=80=A6/emacs$ git rm src/bitmaps/README [=E2=80=A6] src/bitmaps/stip= ple.xbm =E2=80=A6/emacs$ git commit -m [=E2=80=A6commit message=E2=80=A6] Alternatively, if you deleted them accidentally (or they got deleted and you do not know why), you can restore them this way: =E2=80=A6/emacs$ git checkout -- src/bitmaps/README [=E2=80=A6] src/bit= maps/stipple.xbm Or, if you do not have any work in progress, you can reset your working copy to the state of the current revision: =E2=80=A6/emacs$ git reset --hard