What you know you can't explain, but you feel it. You've felt it your entire life, that there's something wrong with the world. You don't know what it is, but it's there, like a splinter in your mind, driving you mad.
Main /
GitThis is the beginnings of a 'cheat sheet' for commonly used git commands. Branching model: http://nvie.com/posts/a-successful-git-branching-model/ Handling merge conflicts: http://www.gitguys.com/topics/merging-with-a-conflict-conflicts-and-resolutions/ Using the 'rebase' command: https://www.atlassian.com/git/tutorials/merging-vs-rebasing/workflow-walkthrough How to undo (almost) anything with Git: https://github.com/blog/2019-how-to-undo-almost-anything-with-git Squash several Git commits into a single commit: http://makandracards.com/makandra/527-squash-several-git-commits-into-a-single-commit http://wildlyinaccurate.com/a-hackers-guide-to-git/ https://git-scm.com/docs/git-reset http://www.alexkras.com/19-git-tips-for-everyday-use/ Reverting a commit
If you haven't pushed your commit yet, then there are a few options.Do not do this if you have already pushed your commit!
If you have pushed the commit upstream, but if there are no other users of the brach
To undo changes on your local repo, and set your branch to exactly match the remote branch:
|