Git Power Routines
5 likes14,467 views
The document presents a session led by Nicola Paolucci on mastering Git and version control practices including conflict resolution, merging strategies, and commands for handling repositories. It covers practical tips like using aliases for commands, understanding rebase and merge strategies, and incorporates resources for improving Git proficiency. The session encourages following along with a sample project to practice and engage with the content presented.
![ADVENTURE AWAITS
House keeping [1]
Get a nice prompt: Liquid prompt is awesome
http://bit.do/liquid-prompt](https://image.slidesharecdn.com/paolucci-git-power-routines-150722082712-lva1-app6891/85/Git-Power-Routines-5-320.jpg)
![ADVENTURE AWAITS
House keeping [2]
If you are creating a new repository, start with an
empty commit and tag it
git commit -m"[empty] Initial commit" --allow-empty
git tag initial <first-sha-1> -m"Tag initial commit"](https://image.slidesharecdn.com/paolucci-git-power-routines-150722082712-lva1-app6891/85/Git-Power-Routines-6-320.jpg)
![ADVENTURE AWAITS
House keeping [3]
To speed up the typing I have created a few
aliases that we will re-use throughout
ls = log --decorate --oneline
ll = log --decorate --numstat
http://bit.do/gitconfig](https://image.slidesharecdn.com/paolucci-git-power-routines-150722082712-lva1-app6891/85/Git-Power-Routines-7-320.jpg)
![CONFLICT RESOLUTION
Aliases for easy conflict resolution
Add these to [alias] in .gitconfig:
ours = "!f() {
}; f"
git checkout --ours $@ && git add $@;](https://image.slidesharecdn.com/paolucci-git-power-routines-150722082712-lva1-app6891/85/Git-Power-Routines-25-320.jpg)
![Stage this hunk [y,n,q,a,d,/,s,e,?]? ?
y - stage this hunk
n - do not stage this hunk
q - quit; do not stage this hunk or any of the remaining ones
a - stage this hunk and all later hunks in the file
d - do not stage this hunk or any later hunks in the file
g - select a hunk to go to
/ - search for a hunk matching the given regex
j - leave this hunk undecided, see next undecided hunk
J - leave this hunk undecided, see next hunk
k - leave this hunk undecided, see previous undecided hunk
K - leave this hunk undecided, see previous hunk
s - split the current hunk into smaller hunks
e - manually edit the current hunk
? - print help](https://image.slidesharecdn.com/paolucci-git-power-routines-150722082712-lva1-app6891/85/Git-Power-Routines-38-320.jpg)
Git Power Routines
- 1. Git Power Routines NICOLA PAOLUCCI • DEVELOPER INSTIGATOR • ATLASSIAN • @DURDN Master the art and practice of DVCS
- 2. @durdn REMOVE BINARIES Follow along, solve real world daily version control situations CONFLICT RESOLUTION MERGE STRATEGIES INTERACTIVE COMMITS AMEND AND REBASE
- 3. ADVENTURE AWAITS Follow along the adventure This session won’t be interactive but you can follow along and try to beat me to tasks by cloning this repository git clone [email protected]:nicolapaolucci/starwars-summary.git
- 4. @durdn About the sample project
- 5. ADVENTURE AWAITS House keeping [1] Get a nice prompt: Liquid prompt is awesome http://bit.do/liquid-prompt
- 6. ADVENTURE AWAITS House keeping [2] If you are creating a new repository, start with an empty commit and tag it git commit -m"[empty] Initial commit" --allow-empty git tag initial <first-sha-1> -m"Tag initial commit"
- 7. ADVENTURE AWAITS House keeping [3] To speed up the typing I have created a few aliases that we will re-use throughout ls = log --decorate --oneline ll = log --decorate --numstat http://bit.do/gitconfig
- 8. @durdn Common and not so common un-doings and re-doings Amending and Re-basing
- 9. Credit: Emma Jane Hogbin Westby @emmajanehw
- 10. Credit: Emma Jane Hogbin Westby @emmajanehw
- 11. Obvious!
- 12. THEORY Always think of these Work directory Which tree does my command affect? Index or Staging area Local repository (.git) Remotes
- 13. UNDOINGS Memorise or alias this to amend quickly Amend the last commit with everything I have here uncommitted and new caa = commit -a --amend -C HEAD
- 14. THEORY Default git reset is of type mixed… Work directory Which tree does my command affect? Index or Staging area Local repository (.git) HEAD master git reset HEAD~ HEAD HEAD HEAD
- 15. changes THEORY Default git reset is a mixed reset… Work directory Which tree does my command affect? Index or Staging area Local repository (.git) HEAD master git reset HEAD~ HEAD HEAD
- 16. @durdn Ancestry references You can specify commits via their ancestry. The more common examples are HEAD^ = the parent of commit HEAD HEAD~2 = traverses the first parent 2 times, finds the grand parent
- 17. Now let’s change a commit in the past
- 18. @durdn What is a rebase? It’s a way to replay commits, one by one, on top of a branch master feature
- 19. @durdn What is an --interactive rebase? Helps you clean up your private branches before publishing them reword fixup pick squash edit exec
- 20. For complex history cleanup use git filter-branch or BFG
- 21. UNDOINGS BFG Repo-Cleaner is a nice option http://bit.do/bfg
- 22. @durdn Let’s learn to solve conflicts Believe me, it can be done without tears and sweat.
- 23. CONFLICT RESOLUTION A word on terminology Current checked out branch --ours What do ours and theirs mean when solving conflicts? Commit coming in (i.e. via merge) --theirs
- 24. CONFLICT RESOLUTION Basics for easy conflict resolution The common commands are: $ git checkout --ours/--theirs <file> Check back out our own/their own version of the file $ git add <file> Add the change to the index will resolve the conflict
- 25. CONFLICT RESOLUTION Aliases for easy conflict resolution Add these to [alias] in .gitconfig: ours = "!f() { }; f" git checkout --ours $@ && git add $@;
- 26. @durdn Embrace useful merge strategies Merging the right way can go a long way…
- 27. @durdn What is a merge? Merge commit master feature merges keep the context of the feature’s commits feature m aster
- 28. tree f362c42032aff677c1a09c3f070454df5b411239 parent 49a906f5722ad446a131778cea52e3fda331b706 parent bd1174cd0f30fe9be9efdd41dcd56256340f230e author Marcus Bertrand <[email protected]> 1409002123 -0700 committer Marcus Bertrand <[email protected]> 1409002123 -0700 Merge branch 'foo/mybranch' .git/objects/36/80d8c8fd182f97cb0e75045e2fed5c7b7613ed commit Anatomy of a merge
- 29. @durdn Let’s talk about merge strategies! git has breadth of choice on how to merge changes! recursiveresolve octopus subtreeours yours?
- 30. @durdn merge strategy: ours master feature Records a merge but skips incoming changes IGNORE!
- 31. strategy --ours is useful to promote recent branches to master
- 32. @durdn feature What is a fast-forward merge? master It will just shift the HEAD tag feature m aster
- 33. @durdn What is a fast-forward merge? master It will just shift the HEAD tag feature m aster
- 34. Octopus merge is nice for staging servers.
- 35. UNDOINGS Octopus Merge can be very useful http://bit.do/git-octopus
- 36. UNDOINGS Octopus Merge can be very useful
- 37. @durdn Interactive add (and commit) Splitting commits semantically in flight!
- 38. Stage this hunk [y,n,q,a,d,/,s,e,?]? ? y - stage this hunk n - do not stage this hunk q - quit; do not stage this hunk or any of the remaining ones a - stage this hunk and all later hunks in the file d - do not stage this hunk or any later hunks in the file g - select a hunk to go to / - search for a hunk matching the given regex j - leave this hunk undecided, see next undecided hunk J - leave this hunk undecided, see next hunk k - leave this hunk undecided, see previous undecided hunk K - leave this hunk undecided, see previous hunk s - split the current hunk into smaller hunks e - manually edit the current hunk ? - print help
- 39. @durdn Switch context at will Git stash power techniques
- 40. @durdn git stash is awesome It’s a way to temporarily store your unsaved work on a stack of patches stash@{0} stash@{1} stash@{2} stash@{3} git stash save
- 41. @durdn
- 42. Thank you! NICOLA PAOLUCCI • DEVELOPER INSTIGATOR • ATLASSIAN • @DURDN Twitter: @durdn