Databases
StackOverflow2013
Postsdbo
POHow can i remove 'Changes not staged for commit'? in git
Body
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POHow can i remove 'Changes not staged for commit'? in git
    text
    copied!<p>When I do 'git status', I get</p> <pre><code>% git status # Not currently on any branch. # Changes not staged for commit: # (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: Source/WebKit/win/WebKit.vcproj/WebKitApple.vsprops # modified: Source/WebKit/win/WebKit.vcproj/WebKitDirectX.vsprops </code></pre> <p>But after I did '% git checkout -- Source/WebKit/win/WebKit.vcproj/WebKitApple.vsprops', I see get the same:</p> <pre><code>% git checkout -- Source/WebKit/win/WebKit.vcproj/WebKitApple.vsprops % git status # Not currently on any branch. # Changes not staged for commit: # (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: Source/WebKit/win/WebKit.vcproj/WebKitApple.vsprops # modified: Source/WebKit/win/WebKit.vcproj/WebKitDirectX.vsprops # </code></pre> <p>How can I remove those "changes not staged for commit"?</p> <p>I have even tried 'git stash', still some how those changes stuck around.</p> <p>I have do a 'git diff'. And this is the result, I don't see ^M: And I have looked at '.gitconfig', I don't have 'autoctrl</p> <pre><code>% git diff diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitApple.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitApple.vsprops index 2ea7a51..9643739 100644 --- a/Source/WebKit/win/WebKit.vcproj/WebKitApple.vsprops +++ b/Source/WebKit/win/WebKit.vcproj/WebKitApple.vsprops @@ -1,12 +1,12 @@ -&lt;?xml version="1.0" encoding="Windows-1252"?&gt; -&lt;VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WebKitApple" - &gt; - &lt;Tool - Name="VCLinkerTool" - AdditionalDependencies="CFNetwork$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib QTMovieWin$(WebKitConfigSuffix).lib WebKitSystemInterface$(WebKitConfigSuffix).lib" - DelayLoadDLLs="QTMovieWin$(WebKitConfigSuffix).dll" - /&gt; +&lt;?xml version="1.0" encoding="Windows-1252"?&gt; +&lt;VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="WebKitApple" + &gt; + &lt;Tool + Name="VCLinkerTool" + AdditionalDependencies="CFNetwork$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib QTMovieWin$(WebKitConfigSuffix).lib WebKitSystemInterface$(WebKitConfigSuffix).lib" + DelayLoadDLLs="QTMovieWin$(WebKitConfigSuffix).dll" + /&gt; &lt;/VisualStudioPropertySheet&gt; \ No newline at end of file diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitDirectX.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitDirectX.vsprops index 797b4cb..c95c87d 100644 --- a/Source/WebKit/win/WebKit.vcproj/WebKitDirectX.vsprops +++ b/Source/WebKit/win/WebKit.vcproj/WebKitDirectX.vsprops @@ -1,15 +1,15 @@ -&lt;?xml version="1.0" encoding="Windows-1252"?&gt; -&lt;VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" - Name="WebKitDirectX" - &gt; - &lt;Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="&amp;quot;$(DXSDK_DIR)\Include&amp;quot;" - /&gt; - &lt;Tool - Name="VCLinkerTool" - AdditionalLibraryDirectories="$(DXSDK_DIR)\Lib\x86" - /&gt; +&lt;?xml version="1.0" encoding="Windows-1252"?&gt; +&lt;VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="WebKitDirectX" + &gt; + &lt;Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="&amp;quot;$(DXSDK_DIR)\Include&amp;quot;" + /&gt; + &lt;Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories="$(DXSDK_DIR)\Lib\x86" + /&gt; &lt;/VisualStudioPropertySheet&gt; \ No newline at end of file </code></pre>
 

Querying!

 
Guidance
An individual column

Larger individual text columns get their own page to allow for proper reading.

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