Databases
StackOverflow2013
Postsdbo
POGit: How to revert 2 files that are stubbornly stuck at "Changed but not committed"?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGit: How to revert 2 files that are stubbornly stuck at "Changed but not committed"?
    primarykey
    data
    text
    <p>I have a repo that has two files that supposedly I changed locally.</p> <p>So I'm stuck with this:</p> <pre><code>$ git status # On branch master # Changed but not updated: # (use "git add &lt;file&gt;..." to update what will be committed) # (use "git checkout -- &lt;file&gt;..." to discard changes in working directory) # # modified: dir1/foo.aspx # modified: dir2/foo.aspx # no changes added to commit (use "git add" and/or "git commit -a") </code></pre> <p>Doing <code>git diff</code> says that the entire file contents have changed, even though from eyeballing it that seems untrue (there seem to be common line ranges that diff seems to be failing to see).</p> <p>Interestingly I don't remember changing these files locally. This repo is used with one remote repo (private, at GitHub.com, FWIW).</p> <p>No matter what I've tried, I can't discard these local changes. I have tried all of:</p> <pre><code>$ git checkout -- . $ git checkout -f $ git checkout -- dir1/checkout_receipt.aspx $ git reset --hard HEAD $ git stash save --keep-index &amp;&amp; git stash drop $ git checkout-index -a -f </code></pre> <p>In other words I've tried everything described in <a href="https://stackoverflow.com/questions/52704/how-do-you-discard-unstaged-changes-in-git">How do I discard unstaged changes in Git?</a> plus more. But the 2 files remain stuck as "changed but not committed".</p> <p>What the heck would cause two files to be stuck like this and seemingly "un-revert-table"??</p> <p>P.S. In the list above showing commands I'd already tried, I mistakenly wrote <code>git revert</code> when I meant <code>git checkout</code>. I'm sorry and thank you to those of you who answered that I should try <code>checkout</code>. I edited the question to correct it. I definitely did already try <code>checkout</code>.</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USCommunity
    1. USGreg Hendershott
    plurals
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    3. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    3. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POGit: How to revert 2 files that are stubbornly stuck at "Changed but not committed"?
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POGit: How to revert 2 files that are stubbornly stuck at "Changed but not committed"?
      1. USDerek Litz
      1. VTFavorite
    3. VO
      singulars
      1. POGit: How to revert 2 files that are stubbornly stuck at "Changed but not committed"?
      1. This table or related slice is empty.
      1. VTUpMod
    1. CODoes `git diff --ignore-space-change` or `git diff --ignore-all-space` make a difference in the output of `git diff`?
      singulars
      1. POGit: How to revert 2 files that are stubbornly stuck at "Changed but not committed"?
      1. USjeremiahd
    2. CO@jermiahd Yes! With either flag, `git diff` says the files are identical.
      singulars
      1. POGit: How to revert 2 files that are stubbornly stuck at "Changed but not committed"?
      1. USGreg Hendershott
    3. COPossible duplicate of http://stackoverflow.com/questions/2016404/git-status-shows-modifications-git-checkout-file-doesnt-remove-them. I like the accepted answer there better anyway, which is to set `git config --global core.autocrlf false` instead of 'true'.
      singulars
      1. POGit: How to revert 2 files that are stubbornly stuck at "Changed but not committed"?
      1. USJohann
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload