I made a change in a script and committed it. Then I made a few other changes, and pushed them to a remote repository and such.
Then I realised that first change I mentioned was stupid, and want to undo it.. Can I "unapply" that commit, without manually copy/pasting the diff?
As an example: I have two files, a.py and b.py:
Commit 1:
I delete a function in a.py
Commit 2:
I change a few lines in b.py
Commit 3:
I change the docstring in a.py
Can I undo that function deletion, and make it appear as "commit 4" (rather than deleting commit 1)
Yes, you can use git revert for this. See the git manual section on this for more information.
The gist is that you can say:
git revert 4f4k2a
Where 4f4k2a is the id of the commit you'd like to undo, and it will try to undo it.