I went ahead and did a commit of multiple files, my intentions of course to push later.
One of these files I can't send to the server, so I want to remove it from my commit BUT I want to keep the changes I have in this file.. So I want to remove the commit but keep this version in my working copy..
Does this make sense? I'm not sure what to do and I just had a big scare and thought I had lost all my work :/
Easiest way assuming you haven't pushed yet and the file was a brand new file that was added in your last commit:
Now your commit history shouldn't contain the file but it should still be sitting in your working copy intact and waiting to be committed as an untracked file.
Sumali's answer is great. In case his assumption that the file is "new" is incorrect, you can do something very similar (Full credit to Sumali for steps 1 and 4, which I copied verbatim):
This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.Read more
Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs