git primer

A git primer I gave at Rolemodel Software 23 Feb 2012

Transcript

1. git Brandon Mathis brandonmathis.me github.com/keysetts Friday, March 9, 12
2. Being clever isn’t helpful Friday, March 9, 12
3. Understanding your tools Friday, March 9, 12
4. Friday, March 9, 12
5. Friday, March 9, 12
6. git basic http://www.ndpsoftware.com/git- cheatsheet.html Friday, March 9, 12
7. git basic Friday, March 9, 12
8. 5 parts to a git repo stash workspace index local repository (repo) upstream repo Friday, March 9, 12
9. 5 parts to a git repo stash workspace index !!!local repository (repo)!!! upstream repo Friday, March 9, 12
10. workspace currently ‘work in progress’ changes code here does not technically exist Friday, March 9, 12
11. index (the tarmac) Friday, March 9, 12
12. index (the tarmac) Friday, March 9, 12
13. index (the tarmac) snapshot of current working tree staged changes live here, Friday, March 9, 12
14. local repo (0-20,000 ft) Friday, March 9, 12
15. local repo (0-20,000 ft) Friday, March 9, 12
16. local repo (0-20,000 ft) commits live here not set in stone! Friday, March 9, 12
17. upstream repo (32,000 feet) aka: origin Friday, March 9, 12
18. upstream repo (32,000 feet) Friday, March 9, 12
19. upstream repo (32,000 feet) where commits live and are shared Friday, March 9, 12
20. upstream repo (32,000 feet) default branches: -shared_feature_x -shared_feature_y -release_y Friday, March 9, 12
21. stash Friday, March 9, 12
22. stash Friday, March 9, 12
23. stash lots of development happening? stash your changes work on something new Friday, March 9, 12
24. stash Friday, March 9, 12
25. stash Friday, March 9, 12
26. stash Friday, March 9, 12
27. stash Friday, March 9, 12
28. stash Friday, March 9, 12
29. five layers of git Friday, March 9, 12
30. merge commits Friday, March 9, 12
31. the good Friday, March 9, 12
32. the bad Friday, March 9, 12
33. the ugly Friday, March 9, 12
34. merge commits how do I avoid them? :’( Friday, March 9, 12
35. live code time! Friday, March 9, 12
36. rebasing Friday, March 9, 12
37. rebasing Friday, March 9, 12
38. rebasing origin/head has diverged Friday, March 9, 12
39. rebasing git pull Friday, March 9, 12
40. rebasing git pull Friday, March 9, 12
41. the bad Friday, March 9, 12
42. rebasing Friday, March 9, 12
43. rebasing git rebase Friday, March 9, 12
44. rebasing git rebase Friday, March 9, 12
45. rebasing git rebase Friday, March 9, 12
46. easy enough! but how does hit stuff work?! Friday, March 9, 12
47. plumbing and porcelain plumbing hash-object read-tree write-tree update-ref ... porcelain add commit checkout branch remote stash push pull pop vs Friday, March 9, 12
48. basic structure of git dir Friday, March 9, 12
49. git is a database to be more specific: git is a key-value data store (content in, key out) What do I mean by that?! Friday, March 9, 12
50. git is a database store anything into git and get a key-value returned Friday, March 9, 12
51. live code time? Friday, March 9, 12
52. git is a database store anything into git and get a key-value returned Friday, March 9, 12
53. Create From existing data cd ~/my_project_dir git init git add . From existing repo git clone ~/existing/repo ~/new/repo git clone you@host.org:dir/project.git default protocol is ssh Browse Files changed in working directory git status Changes to tracked files git diff Changes between ID1 and ID2 git diff <ID1> <ID2> History of changes git log Who changed what and when in a file git blame <file> A commit identified by ID git show <ID> A specific file from a specific ID git diff <ID>:<FILE> Search for patterns git grep <pattern> [path] Change Using your favorite editor / IDE Revert Return to the last committed state git checkout -f | git reset --hard you cannot undo a hard reset Revert the last commit git revert HEAD Creates a new commit Revert specific commit git revert $id Creates a new commit Fix the last commit git commit -a --amend after editing the broken files Checkout the ID version of a file git checkout <ID> <file> Update Fetch latest changes from origin git fetch this does not merge them Pull latest changes from origin git pull does a fetch followed by a merge Apply a patch that someone sent you git am -3 patch.mbox In case of conflict, resolve the conflict and git am --resolve Commit Commit all local changes git commit -a Branch List all branches git branch Switch to the BRANCH branch git checkout <BRANCH> Merge branch B1 into branch B2 git checkout <B2> git merge <B1> Create branch based on HEAD git branch <BRANCH> Create branch based on another git branch <new> <base> Delete a branch git branch -d <branch> Publish Prepare a patch for other developers git format-patch origin Push changes to origin git push [origin] [branch] Make a version or milestone git tag <version_name> Cheat Sheet This work is licensed under a Creative Commons Attribution-Share Alike 3.0 Unported License Useful tips Get help git help [command] Create empty branch git symbolic-ref HEAD refs/heads/newbranch rm .git/index git clean -fdx <do work> git add your files git commit -m 'Initial commit' Graphical log git log --graph git log --graph --pretty=oneline -- abbrev-commit Push branch to remote git push <origin> <branch> Delete remote branch and locally git push <origin> :<branch> git branch -d <branch> Resolve merge conflicts View merge conflicts git diff View merge conflicts against base file git diff --base <FILE> View merge conflicts against other changes git diff --theirs <FILE> View merge conflicts against your changes git diff --ours <FILE> After resolving conflicts, merge with git add <CONFLICTING_FILE> git rebase --continue Configuration git config [--global] global is stored in ~/.gitconfig user user.name $name user.email $email color color.ui auto github github.user $user github.token $token optimisation pack.threads 0 diff.renamelimit 0 do not use on low memory p windows core.autocrlf true http://github.com/AlexZeitler/gitcheatsheet Friday, March 9, 12
54. stashing: http://progit.org/book/ch6-3.html pro-git: http://progit.org/ git-book: http://progit.org/ebook/progit.pdf git visualized: http://www.ndpsoftware.com/ git-cheatsheet.html Friday, March 9, 12
55. Bob Anderson (1922-2012) Performed Darth Vader’s lightsaber duels (V, VI) Choreographed: Highlander The Princess Bride The three Musketeers Zorro LotR movies (The Hobbit) Friday, March 9, 12