So You Think You Know Git - Part 2

The second part of my So You Think You Know Git talk series. In this edition, we cover:

* switch and restore
* hooks
* attributes, smudge and clean filters
* fixup commits
* rebasing stacks
* scalar
* worktrees

Transcript

1. So You Think You Know Git? Co-founder of GitHub / GitButler Scott Chacon part 2
2. About Me
3. github.com About Me
4. git-scm.com/book github.com About Me
5. git-scm.com/book gitbutler.com github.com About Me
6. - There are ~145 commands in Git - There are still an average of 9 commits per day - ~10k commits in the last 3 years - Do you know it all? How Well Do You Know Git?
7. Let's Do This
8. -switch and restore -hooks -attributes, smudge and clean filters -fixup commits -rebasing stacks -scalar -worktrees Let's Do This
9. Let's Do This -switch and restore -hooks -attributes, smudge and clean filters -fixup commits -rebasing stacks -scalar -worktrees Shotgun buffet
10. Let's Do This Shotgun buffet blog.gitbutler.com -switch and restore -hooks -attributes, smudge and clean filters -fixup commits -rebasing stacks -scalar -worktrees
11. Switch and Restore
12. Switch and Restore ❯ git checkout branch ❯ git checkout file.txt ❯ git checkout HEAD@{10.minutes.ago} -- file.txt ❯ git checkout -p file.txt
13. Switch and Restore ❯ git checkout branch ❯ git switch branch ❯ git switch -c new_branch
14. Switch and Restore ❯ git checkout file.txt ❯ git restore file.txt ❯ git restore -- source HEAD@{10.minutes.ago} file.txt ❯ git restore -p file.txt
21. Hooks
22. Hooks - applypatch-msg - pre-applypatch - post-applypatch - pre-commit - pre-merge-commit - prepare-commit-msg - commit-msg - post-commit - pre-rebase - post-checkout - post-merge - pre-push - pre-receive - update - proc-receive - post-receive - post-update - reference-transaction - push-to-checkout - pre-auto-gc - post-rewrite - sendemail-validate - fsmonitor-watchman - p4-changelist - p4-prepare-changelist - p4-post-changelist - p4-pre-submit - post-index-change (28)
23. Hooks - applypatch-msg - pre-applypatch - post-applypatch - pre-commit - pre-merge-commit - prepare-commit-msg - commit-msg - post-commit - pre-rebase - post-checkout - post-merge - pre-push - pre-receive - update - proc-receive - post-receive - post-update - reference-transaction - push-to-checkout - pre-auto-gc - post-rewrite - sendemail-validate - fsmonitor-watchman - p4-changelist - p4-prepare-changelist - p4-post-changelist - p4-pre-submit - post-index-change (24) (- git email stuff)
24. Hooks - applypatch-msg - pre-applypatch - post-applypatch - pre-commit - pre-merge-commit - prepare-commit-msg - commit-msg - post-commit - pre-rebase - post-checkout - post-merge - pre-push - pre-receive - update - proc-receive - post-receive - post-update - reference-transaction - push-to-checkout - pre-auto-gc - post-rewrite - sendemail-validate - fsmonitor-watchman - p4-changelist - p4-prepare-changelist - p4-post-changelist - p4-pre-submit - post-index-change (20) (- perforce stuff)
25. Hooks - applypatch-msg - pre-applypatch - post-applypatch - pre-commit - pre-merge-commit - prepare-commit-msg - commit-msg - post-commit - pre-rebase - post-checkout - post-merge - pre-push - pre-receive - update - proc-receive - post-receive - post-update - reference-transaction - push-to-checkout - pre-auto-gc - post-rewrite - sendemail-validate - fsmonitor-watchman - p4-changelist - p4-prepare-changelist - p4-post-changelist - p4-pre-submit - post-index-change (14) (- server stuff)
26. Hooks - applypatch-msg - pre-applypatch - post-applypatch - pre-commit - pre-merge-commit - prepare-commit-msg - commit-msg - post-commit - pre-rebase - post-checkout - post-merge - pre-push - pre-receive - update - proc-receive - post-receive - post-update - reference-transaction - push-to-checkout - pre-auto-gc - post-rewrite - sendemail-validate - fsmonitor-watchman - p4-changelist - p4-prepare-changelist - p4-post-changelist - p4-pre-submit - post-index-change (11) (- MS scaling stuff)
27. Hooks - applypatch-msg - pre-applypatch - post-applypatch - pre-commit - pre-merge-commit - prepare-commit-msg - commit-msg - post-commit - pre-rebase - post-checkout - post-merge - pre-push - pre-receive - update - proc-receive - post-receive - post-update - reference-transaction - push-to-checkout - pre-auto-gc - post-rewrite - sendemail-validate - fsmonitor-watchman - p4-changelist - p4-prepare-changelist - p4-post-changelist - p4-pre-submit - post-index-change (11)
28. Hooks - pre-commit - prepare-commit-msg - commit-msg - post-commit - pre-rebase - post-rewrite - post-merge - pre-merge-commit - post-checkout - reference-transaction - pre-push (11) Commit Stuff Rewriting Stuff Merging Stuff Switching/Pushing Stuff
29. Hooks: Examples - commit message formatting - package install - update ctags - submodule status - tabs or spaces - linting - large files - test passes - rebasing merged commit prevention
30. Hooks: Helpers - pre-commit - husky
31. Hooks: pre-commit ❯ brew install pre-commit ❯ pre-commit sample-config > .pre-commit-config.yaml ❯ pre-commit install
32. Hooks: pre-commit ❯ brew install pre-commit
33. Hooks: pre-commit ❯ brew install pre-commit
34. Hooks: pre-commit ❯ brew install pre-commit
35. Hooks: husky ❯ npm install -- save-dev husky ❯ npx husky init
36. Hooks: husky ❯ npm install -- save-dev husky ❯ npx husky init
37. Hooks: husky ❯ npm install -- save-dev husky ❯ npx husky init
38. Attributes
39. Attributes ❯ git diff diff -- git a/image.png b/image.png index 88839c4 .. 4afcb7c 100644 Binary files a/image.png and b/image.png differ
40. Attributes ❯ exiftool image.png ExifTool Version Number : 7.74 File Name : image.png Directory : . File Size : 94 kB File Modification Date/Time : 2009 : 04 : 21 07 : 02 : 43-07 : 00 File Type : PNG MIME Type : image/png Image Width : 1056 Image Height : 827 Bit Depth : 8 Color Type : RGB with Alpha Compression : Deflate/Inflate Filter : Adaptive Interlace : Noninterlaced Profile CMM Type : appl
41. Attributes ❯ echo '*.png diff=exif' >> .gitattributes # take every file that ends in png # and pre-process them with a strategy called ‘exif’ ❯ git config diff.exif.textconv exiftool # the 'exif' strategy is to run exiftool on the file
42. Attributes ❯ echo '*.png diff=exif' >> .gitattributes # take every file that ends in png # and pre-process them with a strategy called ‘exif’ ❯ git config diff.exif.textconv exiftool # the 'exif' strategy is to run exiftool on the file
43. Smudge and Clean
44. Smudge and Clean
45. Smudge and Clean
46. Smudge and Clean
47. Smudge and Clean
48. Smudge and Clean
49. Smudge and Clean
50. Smudge and Clean: RCS Keywords
51. Smudge and Clean: RCS Keywords / * $Id$ $Header$ $Date$ $DateTime$ $Change$ $File$ $Revision$ $Author$ * /
52. Smudge and Clean: RCS Keywords / * $Id: // depot/test/main.c#10 $ $Header: // depot/test/main.c#10 $ $Date: 2006/06/21 $ $DateTime: 2006/06/21 17 : 42 : 19 $ $Change: 1745 $ $File: / / depot/test/main.c $ $Revision: #10 $ $Author: michael $ / *
53. Smudge and Clean: $Date$
54. Smudge and Clean: $Date$
55. Smudge and Clean: $Date$
56. Smudge and Clean: $Date$
57. Smudge and Clean: $Date$
58. Smudge and Clean: $Date$
59. Smudge and Clean: $Date$
60. Smudge and Clean: $Date$
61. Smudge and Clean: LFS
62. Smudge and Clean: LFS
63. Smudge and Clean: LFS ❯ brew install git-lfs ❯ git lfs install Updated Git hooks. Git LFS initialized. ❯ git lfs track "*.mov" Tracking "*.mov" ❯ git commit -am 'commit movie' [master c0258ddeba] commit movie 1 files changed, 83 insertions(+) create mode 100644 Timeline 1.mov
64. Smudge and Clean: LFS ❯ brew install git-lfs ❯ git lfs install Updated Git hooks. Git LFS initialized. ❯ git lfs track "*.mov" Tracking "*.mov" ❯ git commit -am 'commit movie' [master c0258ddeba] commit movie 1 files changed, 83 insertions(+) create mode 100644 Timeline 1.mov
65. Smudge and Clean: LFS ❯ brew install git-lfs ❯ git lfs install Updated Git hooks. Git LFS initialized. ❯ git lfs track "*.mov" Tracking "*.mov" ❯ git commit -am 'commit movie' [master c0258ddeba] commit movie 1 files changed, 83 insertions(+) create mode 100644 Timeline 1.mov
66. Smudge and Clean: LFS ❯ brew install git-lfs ❯ git lfs install Updated Git hooks. Git LFS initialized. ❯ git lfs track "*.mov" Tracking "*.mov" ❯ git commit -am 'commit movie' [master c0258ddeba] commit movie 1 files changed, 83 insertions(+) create mode 100644 Timeline 1.mov
67. Smudge and Clean: LFS ❯ git cat-file -p HEAD:"Timeline 1.mov" version https: // git-lfs.github.com/spec/v1 oid sha256 : 683d9e177ed4694aa8e99a0de86a79fb929805f5799d036cd4dfe11aa0dc1a97 size 508537858 ❯ cat .gitattributes *.mov filter=lfs diff=lfs merge=lfs -text
68. Smudge and Clean: LFS ❯ git cat-file -p HEAD:"Timeline 1.mov" version https: // git-lfs.github.com/spec/v1 oid sha256 : 683d9e177ed4694aa8e99a0de86a79fb929805f5799d036cd4dfe11aa0dc1a97 size 508537858 ❯ cat .gitattributes *.mov filter=lfs diff=lfs merge=lfs -text
69. Fixup Commits
70. Fixup Commits git commit -- fixup=<commit> git rebase -- autosquash
71. Fixup Commits git commit -- fixup=<commit> git rebase -- autosquash
72. Fixup Commits git commit -- fixup=<commit> git rebase -- autosquash
73. Fixup Commits git commit -- fixup=<commit> git rebase -- autosquash
74. Fixup Commits git commit -- fixup=<commit> git rebase -- autosquash
75. Fixup Commits git commit -- fixup=<commit> git rebase -- autosquash
76. Fixup Commits git commit -- fixup=<commit> git rebase -- autosquash
77. Fixup Commits git commit -- fixup=<commit> git rebase -- autosquash
79. Fixup Commits git commit -- fixup=<commit> git rebase -- autosquash
80. Fixup Commits git commit -- fixup=<commit> git rebase -- autosquash
81. Fixup Commits git commit -- fixup=<commit> git rebase -- autosquash
82. Fixup Commits git commit -- fixup=<commit> git rebase -- autosquash
83. Rebasing Stacks
84. Rebasing Stacks git rebase -- update-refs
85. Rebasing Stacks git rebase -- update-refs
86. Rebasing Stacks git rebase -- update-refs
87. Rebasing Stacks git rebase -- update-refs
88. Rebasing Stacks git rebase -- update-refs
89. Rebasing Stacks git rebase -- update-refs
90. Rebasing Stacks git rebase -- update-refs
91. Rebasing Stacks git rebase -- update-refs
92. Rebasing Stacks git rebase -- update-refs
93. Rebasing Stacks git rebase -- update-refs
94. Rebasing Stacks git rebase -- update-refs
95. Rebasing Stacks git rebase -- update-refs
96. Update Refs by Default ❯ git config rebase.updateRefs true
97. Scaling Git
98. Scaling Git ❯ scalar usage: scalar [-C <directory > ] [-c <key>=<value > ] <command> [< options >] Commands: clone list register unregister run reconfigure delete help version diagnose
99. Scaling Git ❯ scalar usage: scalar [-C <directory > ] [-c <key>=<value > ] <command> [< options >] Commands: clone list register unregister run reconfigure delete help version diagnose
100. Scaling Git: Scalar -prefetching -commit-graph -filesystem monitor -partial cloning -sparse checkout ❯ scalar clone git@github.com:schacon/huge-project.git
101. Worktrees
102. Worktrees - working on more than one branch at a time - provide a new working directory for each branch
103. Worktrees
104. git worktree add
108. git worktree list
109. GitButler gitbutler.com
110. GitButler
117. For even more... Another 45 minutes of this ridiculousness youtube.com/@gitbutlerapp
118. Thank you! Be sure to let us buy you a beer at our drinkup tonight! B'Femme, 7p
119. Be sure to let us buy you a beer at our drinkup tonight! B'Femme, 6p