Revisions to How do I undo 'git add' before commit?

Active reading.

Source Link

edited Nov 3, 2019 at 13:33

31.3k
22
109
132

The question is not clearly posed. The reason is that git add has two meanings:

adding a new file to the staging area, then undo with git rm --cached file.
adding a modified file to the staging area, then undo with git reset HEAD file.

ifIf in doubt, use

git reset HEAD file

Because it does the expected thing in both cases.

Warning: if you do git rm --cached file on a file that was modified (a file that existed before in the repository), then the file will be removed on git commit! It will still exist in your file system, but if anybody else pulls your commit, the file will be deleted from their work tree.

git status will tell you if the file was a new file or modified:

On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    new file:   my_new_file.txt
    modified:   my_modified_file.txt

The question is not clearly posed. The reason is that git add has two meanings:

adding a new file to the staging area, then undo with git rm --cached file.
adding a modified file to the staging area, then undo with git reset HEAD file.

if in doubt, use

git reset HEAD file

Because it does the expected thing in both cases.

Warning: if you do git rm --cached file on a file that was modified (a file that existed before in the repository), then the file will be removed on git commit! It will still exist in your file system, but if anybody else pulls your commit, the file will be deleted from their work tree.

git status will tell you if the file was a new file or modified:

On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    new file:   my_new_file.txt
    modified:   my_modified_file.txt

The question is not clearly posed. The reason is that git add has two meanings:

adding a new file to the staging area, then undo with git rm --cached file.
adding a modified file to the staging area, then undo with git reset HEAD file.

If in doubt, use

git reset HEAD file

Because it does the expected thing in both cases.

Warning: if you do git rm --cached file on a file that was modified (a file that existed before in the repository), then the file will be removed on git commit! It will still exist in your file system, but if anybody else pulls your commit, the file will be deleted from their work tree.

git status will tell you if the file was a new file or modified:

On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    new file:   my_new_file.txt
    modified:   my_modified_file.txt

clarified the effect of `git rm --cached` further and fixed a minor typo

Source Link

edited Oct 30, 2015 at 23:47

Mark Amery

150.3k
87
415
465

The question is not clearly posed. The reason is that git add has two meanings:

adding a new file to the staging area, then undo with git rm --cached file.
adding a modified file to the staging area, then undo with git reset HEAD file.

if in doubt, use

git reset HEAD file

Because it does the expected thing in both cases.

Warning: if you do git rm --cached file on a file that was modified (a file that existed before in the repository), then the file will be removed on git commit! But itIt will still exist in your file system, but if anybody else pulls your commit, the file will be deleted from their work tree.

git status will tell you itif the file was a new file or modified:

On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    new file:   my_new_file.txt
    modified:   my_modified_file.txt

The question is not clearly posed. The reason is that git add has two meanings:

adding a new file to the staging area, then undo with git rm --cached file.
adding a modified file to the staging area, then undo with git reset HEAD file.

if in doubt, use

git reset HEAD file

Because it does the expected thing in both cases.

Warning: if you do git rm --cached file on a file that was modified (a file that existed before in the repository), then the file will be removed on git commit! But it will still exist in your file system.

git status will tell you it the file was a new file or modified:

On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    new file:   my_new_file.txt
    modified:   my_modified_file.txt

The question is not clearly posed. The reason is that git add has two meanings:

adding a new file to the staging area, then undo with git rm --cached file.
adding a modified file to the staging area, then undo with git reset HEAD file.

if in doubt, use

git reset HEAD file

Because it does the expected thing in both cases.

Warning: if you do git rm --cached file on a file that was modified (a file that existed before in the repository), then the file will be removed on git commit! It will still exist in your file system, but if anybody else pulls your commit, the file will be deleted from their work tree.

git status will tell you if the file was a new file or modified:

On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    new file:   my_new_file.txt
    modified:   my_modified_file.txt

added 280 characters in body

Source Link

edited Jan 16, 2014 at 20:00

Michael_Scharf

34.1k
22
76
97

The question is not clearly posed. The reason is that git add has two meanings:

adding a new file to the staging area, then undo with git rm --cached file.
adding a modified file to the staging area, then undo with git reset HEAD file.

But if in doubt, runif in doubt, use

git reset HEAD file

Because it does the expected thing in both cases.

Warning: if you do git rm --cached file on a file that was modified (a file that existed before in the repository), then the file will be removed on git commit! But it will still exist in your file system.

git status will tell you it the file was a new file or modified:

On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    new file:   my_new_file.txt
    modified:   my_modified_file.txt

The question is not clearly posed. The reason is that git add has two meanings:

adding a new file to the staging area, then undo with git rm --cached file.
adding a modified file to the staging area, then undo with git reset HEAD file.

But if in doubt, run

git reset HEAD file

Because it does the expected thing in both cases.

Warning: if you do git rm --cached file on a file that was modified (a file that existed before in the repository), then the file will be removed on git commit! But it will still exist in your file system.

The question is not clearly posed. The reason is that git add has two meanings:

adding a new file to the staging area, then undo with git rm --cached file.
adding a modified file to the staging area, then undo with git reset HEAD file.

if in doubt, use

git reset HEAD file

Because it does the expected thing in both cases.

Warning: if you do git rm --cached file on a file that was modified (a file that existed before in the repository), then the file will be removed on git commit! But it will still exist in your file system.

git status will tell you it the file was a new file or modified:

On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    new file:   my_new_file.txt
    modified:   my_modified_file.txt

Source Link

created Jan 16, 2014 at 19:54

Michael_Scharf

34.1k
22
76
97

Loading

Collectives™ on Stack Overflow

Return to Answer