Is it possible to unstage files (from previous commit) when doing amend in SourceTree?

[Christoffer Pettersson]

When I check "amend latest commit" in SourceTree, I would like to see all the files that were included in that commit in the "Staged files" area, so that I can easily exclude a file and then redo the commit.

Git GUI has this functionality.

Is it possible to unstage files (from previous commit) when doing amend in SourceTree?

[Seth]

Two options for removing those files:

1)You can delete them from your system, and stage the removal, or find the files in SourceTree and choose "Stop Tracking" if you want to keep them.

2) Reset to the previous commit, and re-commit (instead of amending).

[Tim Crall]

You should only do a reset if you haven't pushed the commit, though. A soft reset will move the branch pointer back without changing the working directory. You can then stage only those changes you want to commit, and commit again. This is almost certainly what Git GUI is really doing underneath the hood.

[Seth]

True, if you've pushed the commit, you shouldn't be resetting OR amending. Both operations modify the history, which can give headaches to team members that have already fetched it.

[Christoffer Pettersson]

Yea, this is prior to a push, but I still want to be able to "add" and "remove" from the latest commit. (Its a ways of working for me, I isually push to a temp-commit in my feature-branch and then add/remove changes from that until I am ready ^_^)

[Christoffer Pettersson]

Remove those files from the commit

[Seth]

What are you hoping to achieve by unstaging? Are you wanting to remove those files, or just reverse changes made in them?