Git

Squash commits already pushed to GitHub Here I squash the last N commits by rebasing and force pushing to GitHub or another remote while avoiding this helpful but unwanted error. To https://github.com/LameLemon/pepe-is-the-man.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'https://github.com/LameLemon/pepe-is-the-man.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. First, through interactive rebasing set the HEAD back to the number of commits you want to squash. If you wish to include the root commit replace HEAD~3 with --root. Read more...

Introduction These are a few git commands that I refer to from time to time when I need a reminder. This is by no means a comprehensive guide on how to use git. Contents Introduction Add co-authors to a commit Branching with Git Checkout a remote branch Create a branch from another branch Change the last commit Set the author Set the date Fetch a pull request Squash commits already pushed to GitHub Keep a fork up to date Further reading Add co-authors to a commit This will allow you to give credit to more than one author for a commit. This works on GitHub only, and count towards the contribution history of all authors. Read more...