How to git reset –hard a subdirectory

by

With Git 2.23 (August 2019), you have the new command git restore (also presented here)

git restore --source=HEAD --staged --worktree -- aDirectory
# or, shorter
git restore -s@ -SW  -- aDirectory

That would replace both the index and working tree with HEAD content, like an reset --hard would, but for a specific path.

Original answer (2013)

Note (as commented by Dan Fabulich) that:

  • git checkout -- <path> doesn’t do a hard reset: it replaces the working tree contents with the staged contents.
  • git checkout HEAD -- <path> does a hard reset for a path, replacing both the index and the working tree with the version from the HEAD commit.

As answered by Ajedi32, both checkout forms don’t remove files which were deleted in the target revision.
If you have extra files in the working tree which don’t exist in HEAD, a git checkout HEAD -- <path> won’t remove them.

Note: With git checkout --overlay HEAD -- <path> (Git 2.22, Q1 2019), files that appear in the index and working tree, but not in <tree-ish> are removed, to make them match <tree-ish> exactly.

But that checkout can respect a git update-index --skip-worktree (for those directories you want to ignore), as mentioned in “Why do excluded files keep reappearing in my git sparse checkout?“.

More Related Contents:

  1. How do I revert a Git repository to a previous commit?
  2. Delete commits from a branch in Git
  3. How can I move HEAD back to a previous location? (Detached head) & Undo commits
  4. How do I clone a subdirectory only of a Git repository?
  5. How can I undo git reset –hard HEAD~1?
  6. How to sparsely checkout only one single file from a git repository?
  7. Is it possible to do a sparse checkout without checking out the whole repository first?
  8. Sparse checkout in Git 1.7.0?
  9. Git sparse checkout with exclusion
  10. In plain English, what does “git reset” do?
  11. What’s the difference between “git reset” and “git checkout”?
  12. Undo a particular commit in Git that’s been pushed to remote repos
  13. How do I recover/resynchronise after someone pushes a rebase or a reset to a published branch?
  14. Checkout subdirectories in Git?
  15. What’s the difference between Git Revert, Checkout and Reset?
  16. Recover files that were added to the index but then removed by a git reset
  17. How do I delete a commit from a branch?
  18. Unstaged changes left after git reset –hard
  19. Set Git submodule to shallow clone & sparse checkout?
  20. Why are there two ways to unstage a file in Git?
  21. github/git Checkout Returns ‘error: invalid path’ on Windows
  22. Why git can’t do hard/soft resets by path?
  23. Jenkins and Git sparse checkouts
  24. How can I revert uncommitted changes including files and folders?
  25. Why there are two ways to unstage a file in Git?
  26. git reset vs git reset HEAD
  27. What is difference between ‘git reset –hard HEAD~1’ and ‘git reset –soft HEAD~1’?
  28. reset hard on git push
  29. unstaged files gone after git reset –hard
  30. Can I delete a git commit but keep the changes?

Leave a Comment