git ls-files- undoing unstaged changes
git clean -dngit clean -df
- undoing staged changes
git reset <filename>git reset --soft HEAD~1git reset HEAD~1git reset --hard HEAD~1
- deleting branches
git branch -D <branch>
- stash
git stashgit stash push -m <message>git stash pop <id>git stash applygit stash listgit stash drop <id>git stash clear
-
git merge fast forward
- git merge fast forward (default)
git merge <branch>
- git merge non fast forward
git merge --squash <branch>
- git merge non fast forward (recursive)
- new commit describing Merge
git merge --no-ff <branch>
- rebase
git rebase <branch>
- merge conflict
- git cherry-pick
git cherry-pick <commit>
- ``
- ``
- ``
- ``
- ``
- ``
- ``
- ``
- ``
- ``
- ``
- ``
- ``
Carlos Aguni
Highly motivated self-taught IT analyst. Always learning and ready to explore new skills. An eternal apprentice.
