1. Home
2. Questions
3. AI Assist Labs
4. Tags
6. Challenges
7. Chat
8. Articles
9. Users
11. Jobs
12. Companies
13. Collectives
14. Communities for your favorite technologies. Explore all Collectives
Stack Internal

Stack Overflow for Teams is now called Stack Internal. Bring the best of human thought and AI automation together at your work.
Try for free Learn more
Stack Internal
Bring the best of human thought and AI automation together at your work. Learn more

Return to Answer

add clarification about staged changes

edited Jun 8, 2022 at 8:13

13.7k
6
78
89

For all unstaged files in current working directory use:

git restore .

For a specific file use:

git restore path/to/file/to/revert

That together with git switch replaces the overloaded git checkout (see here), and thus removes the argument disambiguation.

If a file has both staged and unstaged changes, only the unstaged changes shown in git diff are reverted. Changes shown in git diff --staged stay intact.

Before Git 2.23

For all unstaged files in current working directory:

git checkout -- .

For a specific file:

git checkout -- path/to/file/to/revert

-- here to remove ambiguity (this is known as argument disambiguation).

For all unstaged files in current working directory use:

git restore .

For a specific file use:

git restore path/to/file/to/revert

That together with git switch replaces the overloaded git checkout (see here), and thus removes the argument disambiguation.

Before Git 2.23

For all unstaged files in current working directory:

git checkout -- .

For a specific file:

git checkout -- path/to/file/to/revert

-- here to remove ambiguity (this is known as argument disambiguation).

For all unstaged files in current working directory use:

git restore .

For a specific file use:

git restore path/to/file/to/revert

That together with git switch replaces the overloaded git checkout (see here), and thus removes the argument disambiguation.

If a file has both staged and unstaged changes, only the unstaged changes shown in git diff are reverted. Changes shown in git diff --staged stay intact.

Before Git 2.23

For all unstaged files in current working directory:

git checkout -- .

For a specific file:

git checkout -- path/to/file/to/revert

-- here to remove ambiguity (this is known as argument disambiguation).

flip the answers to have more current versions of git at the top

edited Jun 7, 2022 at 16:57

13.7k
6
78
89

For all unstagedunstaged files in current working directory use:

git checkout --restore .

For a specific file use:

git checkout --restore path/to/file/to/revert

That together with --git switch here to remove ambiguityreplaces the overloaded git checkout (this is known as argument disambiguation see here), and thus removes the argument disambiguation.

Before Git 2.23

For Git 2.23 onwards, one may want to use the more specificall unstaged files in current working directory:

git restorecheckout -- .

resp.For a specific file:

git restorecheckout -- path/to/file/to/revert

that together with git switch replaces the overloaded git checkout-- here to remove ambiguity (see herethis is known as argument disambiguation), and thus removes the argument disambiguation.

For all unstaged files in current working directory use:

git checkout -- .

For a specific file use:

git checkout -- path/to/file/to/revert

-- here to remove ambiguity (this is known as argument disambiguation).

For Git 2.23 onwards, one may want to use the more specific

git restore .

resp.

git restore path/to/file/to/revert

that together with git switch replaces the overloaded git checkout (see here), and thus removes the argument disambiguation.

For all unstaged files in current working directory use:

git restore .

For a specific file use:

git restore path/to/file/to/revert

That together with git switch replaces the overloaded git checkout (see here), and thus removes the argument disambiguation.

Before Git 2.23

For all unstaged files in current working directory:

git checkout -- .

For a specific file:

git checkout -- path/to/file/to/revert

-- here to remove ambiguity (this is known as argument disambiguation).

changed mistake of saying "remove disambiguiation" (when it should be remove ambiguity)

edit approved Jun 10, 2021 at 6:53

1.4k
12
25

For all unstaged files in current working directory use:

git checkout -- .

For a specific file use:

git checkout -- path/to/file/to/revert

-- here to remove ambiguity (this is known as argument disambiguation).

For Git 2.23 onwards, one may want to use the more specific

git restore .

resp.

git restore path/to/file/to/revert

that together with git switch replaces the overloaded git checkout (see here), and thus removes the argument disambiguation.

For all unstaged files in current working directory use:

git checkout -- .

For a specific file use:

git checkout -- path/to/file/to/revert

-- here to remove argument disambiguation.

For Git 2.23 onwards, one may want to use the more specific

git restore .

resp.

git restore path/to/file/to/revert

that together with git switch replaces the overloaded git checkout (see here), and thus removes the argument disambiguation.

For all unstaged files in current working directory use:

git checkout -- .

For a specific file use:

git checkout -- path/to/file/to/revert

-- here to remove ambiguity (this is known as argument disambiguation).

For Git 2.23 onwards, one may want to use the more specific

git restore .

resp.

git restore path/to/file/to/revert

that together with git switch replaces the overloaded git checkout (see here), and thus removes the argument disambiguation.

Pointed out the more recent `git restore` command.

edit approved Dec 23, 2020 at 16:24

Carsten Führmann

3.6k
4
30
26

Loading

Bounty Awarded with 300 reputation awarded by CommunityBot

occurred Mar 19, 2019 at 7:25

Fix formatting

edit approved Nov 26, 2018 at 23:54

1.4k
1
21
24

Loading

Add note about argument ambiguation

edit approved Nov 26, 2018 at 20:37

1.4k
1
21
24

Loading

edited body

edited May 9, 2018 at 21:29

24.1k
15
106
159

Loading

Rollback to Revision 2

edited Jul 14, 2014 at 21:58

user456814

Loading

code formatted to highlight the period(.) sign at the end

edit approved May 27, 2014 at 12:04

4k
1
20
20

Loading

added the command git checkout -- . command that has 17 & 10 upvotes in the comments.

edited Aug 13, 2011 at 1:42

9.2k
5
37
46

Loading

answered Sep 9, 2008 at 19:37

82.6k
6
35
37

Loading