HI!
Git is an extremely powerful and often elusive tool to learn. If you do read the man
pages, you often see garbage like this:
If <upstream> is not specified, the upstream configured in
branch.<name>.remote and branch.<name>.merge options will be used
(see git-config(1) for details) and the --fork-point option is
assumed.
These pages will help you discover how to use git, learn the language that it uses to describe what it does, and alert to you some of the common pitfalls and problems that can occur. Elevate your knowledge of git from ‘I can add and push code’, to that of a version control Jedi.
cherry-pick
- re-apply a commitreset
- undoing commits and mergesmerge
- simple merges, converge two branches of commitsrebase
- apply local commits on top of another branchrebase --interactive
- change git history, tidy up commitspush --force-with-lease
- rebasing safely, changing common historylog
, log
back x steps, log
greppingshortlog
for changelogsreflog
- git log’s paranoid brother, fuck up recovery