unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Yuri Khan <yuri.v.khan@gmail.com>
To: martin rudalics <rudalics@gmx.at>
Cc: emacs-devel <emacs-devel@gnu.org>
Subject: Re: Changes not staged for commit with current master
Date: Mon, 7 Aug 2017 16:26:42 +0700	[thread overview]
Message-ID: <CAP_d_8X4N8g6v3jiQ+hNKN254pzTtN50dYPn-a3jHmXcqCUPVw@mail.gmail.com> (raw)
In-Reply-To: <59881DE2.9090708@gmx.at>

On Mon, Aug 7, 2017 at 2:59 PM, martin rudalics <rudalics@gmx.at> wrote:
> git status for master currently tells me
>
> Changes not staged for commit:
>   (use "git add/rm <file>..." to update what will be committed)
>   (use "git checkout -- <file>..." to discard changes in working directory)
>
>         deleted:    src/bitmaps/README
[…]
>         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:

    …/emacs$ git rm src/bitmaps/README […] src/bitmaps/stipple.xbm
    …/emacs$ git commit -m […commit message…]

Alternatively, if you deleted them accidentally (or they got deleted
and you do not know why), you can restore them this way:

    …/emacs$ git checkout -- src/bitmaps/README […] src/bitmaps/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:

    …/emacs$ git reset --hard



  reply	other threads:[~2017-08-07  9:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-07  7:59 Changes not staged for commit with current master martin rudalics
2017-08-07  9:26 ` Yuri Khan [this message]
2017-08-07 10:39   ` martin rudalics

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAP_d_8X4N8g6v3jiQ+hNKN254pzTtN50dYPn-a3jHmXcqCUPVw@mail.gmail.com \
    --to=yuri.v.khan@gmail.com \
    --cc=emacs-devel@gnu.org \
    --cc=rudalics@gmx.at \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).