Git
5 Ways to Undo Mistakes with Git: Discarding Some of Your Local Changes, Resetting a Specific File to a Previous State, Recovering a Lost Revision with the Reflog, Recovering a Deleted Branch, Moving a Commit to a Different Branch
Removing a git commit and force pushing to remove it from history; simonw TILs
How to push to a repo to maintain only one commit – useful if you would otherwise have a whole bunch of data-hogging commits that aren't necessary to keep. From simonw: The latest til.db file is now stored in https://github.com/simonw/til-db – every time I push a new copy of the file there I use git commit --amend to rewrite history followed by git push --force – so that repo only ever contains a single commit which is the commit that added the file. [source]
How to change git master to main note the caveats in the thread
How to remove a pushed commit
Committed and pushed incorrect file otd-tweets-by-mcnees (forgot the html extension).
I could have dealt with the unpushed change but was in a rush and instead went ahead and committed/pushed corrected version otd-tweets-by-mcnees.html
But later I wanted to remove that bad commit/push. Here's how I did it, using procedure from the above web page:
git revert e98adc579131244c56913e0d5afbd5ba395bc6c8
Then git status said local repo was ahead of remote by 1 and that a push was needed. So I did the git push.
The file then did not show up in the jrdmb/jrdmb github repo.
How to Squash the First Two Commits in a Git Repository — Marius Schulz
Learn to change history with git rebase; git rebase in depth | How does Git Rebase work and compare with Git Merge and Git Interactive Rebase | What is Git Rebase and How Is it Different than Merging? | Change a Git Commit in the Past with Amend and Rebase Interactive – Nick Janetakis | Top 20 git commands and examples caltlgin git wiki tips and commans ref Git: Clear local and remote repo and start over | Git HowTo: revert commit already pushed to remote repository; delete earlier commits | Git and GitHub: How to Revert a Single File | Wiki on git GitHub: Everything you need to know
Git Alternatives Launchpad
Git articles/Tutorials How to Host Your Blog for Free with Jekyll and GitHub Pages | How writers can use github, nice setup/config info | GitHub Project Management | 15 git commands you may not know Especially see #15 on optimizing local repo with 'git gc' jermity Git Notes Glossary with Step Procs | Getting Started | Tutorials | BitBucket 101 | Pro Git online eBook | Learning Git online eBook | How to place the git folder out of your working tree |