For me, the most secure way is to use the update-ref command: git update-ref -d HEAD It will delete the named reference HEAD, so it will reset (softly, you will not lose your work) ALL your commits of your current branch. If what you want is to merge the first commit with the second one, … Read more
git reset –hard 4a155e5 Will move the HEAD back to where you want to be. There may be other references ahead of that time that you would need to remove if you don’t want anything to point to the history you just deleted.
Here’s simpler, “pure Git” way to do it, with no pipeline needed: git log –diff-filter=A — foo.js Check the documentation. You can do the same thing for Deleted, Modified, etc. https://git-scm.com/docs/git-log#Documentation/git-log.txt—diff-filterACDMRTUXB82308203 I have a handy alias for this, because I always forget it: git config –global alias.whatadded ‘log –diff-filter=A’ This makes it as simple as: … Read more
There is a guide to splitting commits in the rebase manpage. The quick summary is: Perform an interactive rebase including the target commit (e.g. git rebase -i <commit-to-split>^ branch) and mark it to be edited. When the rebase reaches that commit, use git reset HEAD^ to reset to before the commit, but keep your work … Read more
If you are at a certain branch mybranch, just go ahead and git checkout commit_hash. Then you can return to your branch by git checkout mybranch. I had the same game bisecting a bug today 🙂 Also, you should know about git bisect.
I found that adding “-i” to the commit command fixes this problem for me. The -i basically tells it to stage additional files before committing. That is: git commit -i myfile.php
Here’s a good workaround. Use the Edit button when viewing the PR in GitHub to change the base branch to something other than master. Then switch it back to master and it will now correctly show only the changes from the most recent commits.
This behaviour is part of git commit‘s default ‘clean-up’ behaviour. If you want to keep lines starting with # you can use an alternative clean-up mode. E.g. git commit –cleanup=whitespace If you do this you have to be careful to remove all # lines that you don’t want to appear in the commit.
A URL of the form https://github.com/<owner>/<project>/commit/<hash> will show you the changes introduced in that commit. For example here’s a recent bugfix I made to one of my projects on GitHub: https://github.com/jerith666/git-graph/commit/35e32b6a00dec02ae7d7c45c6b7106779a124685 You can also shorten the hash to any unique prefix, like so: https://github.com/jerith666/git-graph/commit/35e32b I know you just asked about GitHub, but for completeness: If … Read more
There are four ways of doing so: Clean way, reverting but keep in log the revert: git revert –strategy resolve <commit> Harsh way, remove altogether only the last commit: git reset –soft “HEAD^” Note: Avoid git reset –hard as it will also discard all changes in files since the last commit. If –soft does not … Read more