This document provides an overview of various Git tricks and best practices including branching, Git flow, resolving conflicts, rebasing vs merging, resetting vs reverting, submodules, tags, and resources for further reading. Key topics covered include using feature branches, pulling and merging changes, resolving merge conflicts, resetting the local repository, managing submodule dependencies, and using tags for stable releases versus branches for development.

1. Git Tricks

2. Quick Bio

6. Branching

git pull

git checkout -b new-feature-branch

git add (-A)

git commit -m “Our commit message”

git merge branch-name -m “Merge
message”

git diff <source_branch>
<target_branch>

7. Git Flow

8. Github Flow

10. Resolving
<<<<<<< HEAD
good
=======
bad
>>>>>>> merging-branch

Pick the correct one

Add and commit

11. git stash
- git status

12. git stash

13. git stash pop/apply

14. git blame
- git blame -L line from/line to

15. Rebase
git checkout feature-branch
git rebase master

16. Merge vs. Rebase

17. Rebase vs. Merge

19. git log -–pretty=oneline
git checkout -b new-clean-branch
git cherry-pick ab97540637691bd7...

20. git log

21. Reset vs. Revert

22. Revert vs. Reset

23. Submodules
git submodule add <submodule repo>
<path>
Lines in .gitmodules
Folder in the working directory

24. Clone a project with
submodules
.gitmodules
git submodule init
git submodule sync
git submodule update (--recursive)

25. Remove a submodule

git rm --cached submodule_path

git rm .gitmodules

rm -rf submodule_path/.git

git add submodule_path

git commit -m "remove submodule

26. Update Submodules

cd submodule_dir

git checkout master

git pull

cd ../..

git commit -am “Updated submodule
to version ..”

27. Tags

28. Tags vs. Branches

Tag = Stable version

Branch = Development, Features

29. Work with tags

git tag

git tag -l 'v1.4.2.*'

git tag -a v1.8.6 -m 'Version
1.8.6'

git show v1.86

git push origin v1.8.6

31. Resources
https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
https://guides.github.com/introduction/flow/
https://www.atlassian.com/git/tutorials/resetting-checking-out-and-reverting/commit-level-operations
http://nvie.com/posts/a-successful-git-branching-model/
http://wptavern.com/git-and-wordpress-3-tips-to-do-it-better
Contacts:
E-mail: iv.dimova@gmail.com
Twitter: @iv_wp