1. Life-Saving git tips
We have two branches (dev and master) and one file in both branches with one commit for implementation of below ...
For further actions, you may consider blocking this person and/or reporting abuse
4 is not correct.
git commit --amendwill try to amend the last commit by adding not-to-be-commit.txt to it. So after:wqyou will have effectively squashed not-to-be-commit.txt to the last commit on the branch.To undo a file accidentally added to the index, simply do
git restore --staged not-to-be-commit.txt.There are many ways to do that you can simply write this :
git rm --cached not-to-be-commit.txt
And Please try this one too (The —amend command), it always works for me. I practiced each and every command and wrote here. Let me know if you have other suggestions. Thanks !!
I use --amend everyday to squash changes into the last commit. If you look into the last commit on the branch after doing
git --amend, you'll see that the file you didn't want to add has become part of the commit. :-)git rm --cachedwould indeed work too, however it is the "old way" of doing it. If you have a recent git version, when you rungit status, it would suggest to usegit restore --staged.A personal favourite is:
git reset HEAD^… to undo the last commit, or:
git reset HEAD~n… where n is the number of commits to undo.
It becomes a bit problematic if you've done a push beforehand!
Useful Content
Keep it up
Very useful content n kudos to you!!
Thanks Abhishek for your informative articles. Git is always life saver for a developer.
Great! Sir
Great sir ....
Thank you so much. I wanted to learn this especially when I am editing remote code using terminal.