如何在 SourceTree 中丢弃未提交的更改?

我是 Git 环境的新手,我在 Mac 上使用 BitBucket 和 SourceTree。我现在要做的就是放弃自上次提交以来的更改。我该怎么做?我还没有找到任何类似“丢弃更改”的东西,直接从最后一次提交中提取似乎不起作用。使用 GUI 或命令行完成的解决方案将是很好的。

168472 次浏览

Ok I just noticed that my question was already answered in the question title.

To unstage files use

git reset HEAD /file/name

And to undo the changes to a file

git checkout -- /file/name

If you have a batch of files inside a folder you can undo the whole folder

git checkout -- /folder/name

Note that all these commands are already displayed when you git status

Here I created a dummy repo and listed all 3 possibilities

# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   test
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   test2
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       test3

From sourcetree gui click on working directoy, right-click the file(s) that you want to discard, then click on Discard

I like to use

git stash

This stores all uncommitted changes in the stash. If you want to discard these changes later just git stash drop (or git stash pop to restore them).

Though this is technically not the "proper" way to discard changes (as other answers and comments have pointed out).

SourceTree: On the top bar click on icon 'Stash', type its name and create. Then in left vertical menu you can "show" all Stash and delete in right-click menu. There is probably no other way in ST to discard all files at once.

On SourceTree for Mac, right click the files you want to discard (in the Files in the working tree list), and choose Reset.

On SourceTree for Windows, right click the files you want to discard (in the Working Copy Changes list), and choose Discard.

On git, you'd simply do:

git reset --hard to discard changes made to versioned files;

git clean -xdf to erase new (untracked) files, including ignored ones (the x option). d is to also remove untracked directories and f to force.

On the unstaged file, click on the three dots on the right side. Once you click it, a popover menu will appear where you can then Discard file.

Do as follow,

  • Click on commit
  • Select all by pressing CMD+A that you want to delete or discard
  • Right click on the selected uncommitted files that you want to delete
  • Select Remove from the drop-down list

Ok so in Windows sourcetree that is simple, on macOS I looked as well for a while..

Click Command + Shift + R while in source tree a hidden popup will be shown that will let you discard individual files OR ALL! Why is this hidden? We will never know.. but it works!

enter image description here

It's Ctrl + Shift + r

For me, there was only one option to discard all.

enter image description here

Follow steps to discard multiple uncommited changes in Sourcetree.

New version of Sourcetree does not have -Reset Button- as mentioned previous answer. Thus, please follow these 5 steps for solution.

  1. Right click "File status" and click "Reset...".

enter image description here

  1. Select files. If you want, you can select all of them like the below image.

enter image description here

  1. Click "Reset All".

enter image description here

  1. Again click "Reset All".

enter image description here

  1. Click "Reset".

enter image description here

Welldone..! No more 302 files to discard.

enter image description here