Git from scratch

A Git introduction from scratch to some advanced topics like Rebasing

Transcript

1. Git from scratch Xabier Larrakoetxea @slok69
3. Some background
4. Subversion CVS Team Foundation ... VCS Server Repo User 1 Project User 2 Project User N Project Version Control System
5. Git Mercurial Bazaar ... DVCS Server Repo User 1 Repo User 2 Repo User N Repo Distributed Version Control System
6. Git uses snapshots not diffs File 1 Version 1 File 2 File 3 File 4 File 1 Version 2 File 2 File 3 File 4 Version 3 File 2 File 3 File 4 Version 4 File 2 File 3 File 1 File 1 File 4
7. The zones 3
8. Working directory Staging area Git directory (repo) Remote Git directory (repo) Stage files Checkout Project Commit Push changes
9. Working directory Staging area Git directory (repo) Remote Git directory (repo) Stage files Checkout Project Commit Push changes WTF is this?!
10. Untracked Unmodified Modified Staged Add file Stage file Commit Edit file Remove file
11. Git internals
12. Git File types Commit Tree Author Comitter Tree Blob Blob Blob Blob Print(“Hello world”) Blob package main import( “fmt” ) Blob README HI!
13. SSH FS HTTP/S Git Git Protocols
15. Configuration
16. --system /etc/gitconfig --global $HOME/.gitconfig $GIT_REPO/.git/config Configuration levels
17. $ git config --global user.name “Alex Murphy” --global user.mail Alex.murphy@robo.cop --global color.ui true
18. Ignoring files https://github.com/github/gitignore # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] # C extensions *.so # Distribution / packaging bin/ build/ develop-eggs/ dist/ eggs/ lib/ lib64/ parts/ sdist/ var/ *.egg-info/ # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] # C extensions *.so # Distribution / packaging bin/ build/ develop-eggs/ dist/ eggs/ lib/ lib64/ parts/ sdist/ var/ *.egg-info/ .gitignore
19. Git basics
20. $ git init /home/robocop/pybot --bare /home/robocop/pybot
21. $ git clone https://rbcop@github.com/rbcop/pybot.git git@github.com:ticketbis/tickets.git -b develop git@github.com:ticketbis/t.git
22. $ git add bot/__init__.py tests/ --patch bot/run.py -A .
23. $ git rm bot/__init__.py tests/
24. $ git mv bot/test.py /bot/tests.py
25. Repo status $ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: queueworkers/settings.py # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: queueworkers/logging.conf # modified: queueworkers/utils/logs.py # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # queueworkers/test
26. $ git diff --stat HEAD^^^ HEAD run.py master origin/master --cached
27. Repo Diffs diff --git a/queueworkers/utils/messageimporter.py b/queueworkers/utils/messageimporter.py index 8c5e904..fe57a72 100644 --- a/queueworkers/utils/messageimporter.py +++ b/queueworkers/utils/messageimporter.py @@ -12,8 +12,8 @@ def exec_publisher(publisher, body, channel, method): try: publisher.connect() publisher.publish(body) - if settings.SEND_ACK: - channel.basic_ack(delivery_tag=method.delivery_tag) + #if settings.SEND_ACK: + # channel.basic_ack(delivery_tag=method.delivery_tag) except Exception as e: logger.error("Exception: " + str(e)) raise $ git diff
28. $ git commit -m “Initial commit” -avm “Fucking templates” http://whatthecommit.com
29. commit -a shortcut Working directory Staging area Repository $ Git add $ Git commit Working directory Staging area Repository $ Git commit -a
30. $ git log --graph --decorate --oneline --stat -n 3 --all
31. Repo log * 3b3eac4 (HEAD, branch2) Edited README3 in branch2 | * 77c48e7 (master) Merge branch 'branch2' | |\ | |/ |/| * | 3699398 Modified README 3 in branch2 | * 3cc6283 Modified README 3 in master branch |/ * 736c954 Modified README 3 * 56dedf6 Modified README 1 and 2 * c2f5d57 Initial commit $ git log --graph --decorate --oneline --all http://garmoncheg.blogspot.com.es/2012/06/pretty-git-log.html
32. Remote
33. $ git remote -v add origin git@github.com/slok/go-copy rm origin
34. Repo remotes $ git remote add mirror https://mymirror.com/go-copy.git mirror https://mymirror.com/go-copy.git (fetch) mirror https://mymirror.com/go-copy.git (push) origin git@github.com:slok/go-copy.git (fetch) origin git@github.com:slok/go-copy.git (push) $ git remote -v origin git@github.com:slok/go-copy.git (fetch) origin git@github.com:slok/go-copy.git (push) $ git remote -v
35. $ git push origin master origin :devel
36. $ git fetch origin
37. $ git pull origin master
38. Workflow Working directory Repository Commit n Working directory Repository Commit n+1 Working directory Repository Commit n+2 Working directory Remote repo Push
39. Pointers
40. Position C1 C2 C3 C5 C4 C6 C7 master HEAD dev
41. Undo
42. $ git reset --hard HEAD^^ 56e05fced Before Pushing changes
43. $ git revert ef313dd --no-commit HEAD
44. Git Revert 5f201b3 Updated readme 58e5b57 Implemented creation of dirs in the file service $ git log -n2 --oneline d19f591 Revert "Updated readme" 5f201b3 Updated readme 58e5b57 Implemented creation of dirs in the file service $ git log -n3 --oneline [master d19f591] Revert "Updated readme" 1 file changed, 1 insertion(+), 1 deletion(-) $ git revert 5f201b3
45. $ git checkout -- 56e05fced 56e05fced http://git-scm.com/2011/07/11/reset.html
46. Checkout vs Reset C1 C2 C3 C5 master HEAD C1 C2 C3 C5 master HEAD $ git checkout master~2 $ git reset HEAD~2
47. Branches
48. $ git branch devel -d devel
49. $ git checkout -b devel devel -b devel origin/devel -t origin/devel
50. Branches * devel master remotes/origin/HEAD -> origin/master remotes/origin/master $ git branch -a * master remotes/origin/HEAD -> origin/master remotes/origin/master $ git branch -a Switched to a new branch 'devel' $ git checkout -b devel
51. Merges
52. $ git merge devel --no-commit devel devel -m “My awesome merge”
53. Fast forward merge C1 C2 C3 C5 master dev C1 C2 C3 C5 master dev Updating 817e279..48cdf3a Fast-forward README | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) $ git merge dev
54. Conflicts $ git add ./file4.txt Auto-merging file4.txt CONFLICT (content): Merge conflict in file4.txt Automatic merge failed; fix conflicts and then commit the result. $ git merge dev <<<<<<< HEAD Oh! I'm the only developer here ======= No... You are not alone and this will conflict >>>>>>> dev $ cat ./file4.txt [master 1e90c43] Merge branch 'dev' $ git commit
55. Tags
56. $ git tag -a v1.0 -m "Version 1.0" -a v0.1 f539ca3 -m "Version 0.1" -d f539ca3
57. Remote tags Counting objects: 2, done. Delta compression using up to 4 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (2/2), 311 bytes, done. Total 2 (delta 0), reused 0 (delta 0) To git@github.com:slok/basic-git.git * [new tag] v0.1 -> v0.1 * [new tag] v1.0 -> v1.0 $ git push --tags origin
58. Stash
59. $ git stash list apply stash@{0} pop drop stash@{3}
60. $ git stash Saved working directory and index state WIP on master: 34f7998 #31 Add implementation to mark notifications as read or unread HEAD is now at 34f7998 #31 Add implementation to mark notifications as read or unread $ git stash # On branch master # Your branch is ahead of 'origin/master' by 3 commits. # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: dwarf/notifications/urls.py # modified: dwarf/notifications/views.py # no changes added to commit (use "git add" and/or "git commit -a") Dropped refs/stash@{0} (4cdbd16404fc6e8e378a669df2f168afa71ff1a5) $ git stash pop
61. Alias
62. $ git config --global alias.st status --global alias.ci commit
63. Rebase
64. $ git rebase devel Never rebase a public branch!
65. Rebase step 1 * 17d7264 (master) added notifications index template | * d9d7f36 (HEAD, testing) add more urls for notifications | * b2b673a add urls for notification |/ $ git log --graph -n 3 --oneline --all --decorate First, rewinding head to replay your work on top of it... Applying: add urls for notification Applying: add more urls for notifications $ git rebase master * 893eaef (HEAD, testing) add more urls for notifications * bd886fb add urls for notification * 17d7264 (master) added notifications index template $ git log --graph -n 3 --oneline --all --decorate
66. Rebase step 1 * 17d7264 (master) added notifications index template | * d9d7f36 (HEAD, testing) add more urls for notifications | * b2b673a add urls for notification |/ $ git log --graph -n 3 --oneline --all --decorate First, rewinding head to replay your work on top of it... Applying: add urls for notification Applying: add more urls for notifications $ git rebase master * 893eaef (HEAD, testing) add more urls for notifications * bd886fb add urls for notification * 17d7264 (master) added notifications index template $ git log --graph -n 3 --oneline --all --decorate WTF?!
67. Rebase step 2 * 893eaef (HEAD, testing, master) add more urls for notifications * bd886fb add urls for notification * 17d7264 added notifications index template $ git log --graph -n 3 --oneline --all --decorate Switched to branch 'master' Your branch is ahead of 'origin/master' by 4 commits. $ git checkout master Updating 17d7264..893eaef Fast-forward dwarf/notifications/views.py | 39 ++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) $ git merge testing http://www.youtube.com/watch?v=cSf8cO0WB4o
68. Merge vs Rebase (Initial) C1 C2 C4 C3 C5 master dev
69. Merge vs Rebase (Merge) C1 C2 C4 C3 C5 master dev C6
70. Merge vs Rebase (Rebase) C1 C2 C4 C3 C5 master dev
71. Thank you
72. Questions
73. Kudos
74. Icons: Entypo Typography: Google web fonts OS Logos: http://commons.wikimedia.org Github: https://github.com Google docs: https://docs.google.com Git: http://git-scm.com Progit: http://git-scm.com/book
75. Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) http://xlarrakoetxea.org