So You Think You Know Git?

Years ago I used to do talks on advanced Git stuff. For the last decade or so, I've sort of assumed that everyone knew all the advanced command line stuff by now.

However, in the last few months I’ve been back on the speaking circuit, talking about Git and GitButler and I’ve found that lots of people don’t know a lot of stuff about Git.

This talk is a shotgun of stuff you may not know that Git does.

Transcript

1. So You Think You Know Git? Co-founder of GitHub / GitButler Scott Chacon
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. How Well Do You Know Git? PORCELAIN (82) 44 main commands (add, commit, push, pull, …) 11 manipulators (config, reflog, replace, …) 17 interrogators (blame, fsck, rerere, …) 10 interactors (send-email, p4, svn, …) PLUMBING (63) 19 manipulators (apply, commit-tree, update-ref, …) 21 interrogators (cat-file, for-each-ref, …) 5 syncing (fetch-pack, send-pack, …) 18 internal (check-attr, sh-i18n, …) TOTAL: 145
7. How Well Do You Know Git? PORCELAIN (82) 44 main commands (add, commit, push, pull, …) 11 manipulators (config, reflog, replace, …) 17 interrogators (blame, fsck, rerere, …) 10 interactors (send-email, p4, svn, …) PLUMBING (63) 19 manipulators (apply, commit-tree, update-ref, …) 21 interrogators (cat-file, for-each-ref, …) 5 syncing (fetch-pack, send-pack, …) 18 internal (check-attr, sh-i18n, …) TOTAL: 145
8. How Well Do You Know Git? PORCELAIN (82) 44 main commands (add, commit, push, pull, …) 11 manipulators (config, reflog, replace, …) 17 interrogators (blame, fsck, rerere, …) 10 interactors (send-email, p4, svn, …) PLUMBING (63) 19 manipulators (apply, commit-tree, update-ref, …) 21 interrogators (cat-file, for-each-ref, …) 5 syncing (fetch-pack, send-pack, …) 18 internal (check-attr, sh-i18n, …) TOTAL: 145
9. How Well Do You Know Git? PORCELAIN (82) 44 main commands (add, commit, push, pull, …) 11 manipulators (config, reflog, replace, …) 17 interrogators (blame, fsck, rerere, …) 10 interactors (send-email, p4, svn, …) PLUMBING (63) 19 manipulators (apply, commit-tree, update-ref, …) 21 interrogators (cat-file, for-each-ref, …) 5 syncing (fetch-pack, send-pack, …) 18 internal (check-attr, sh-i18n, …) TOTAL: 145
10. How Well Do You Know Git? PORCELAIN (82) 44 main commands (add, commit, push, pull, …) 11 manipulators (config, reflog, replace, …) 17 interrogators (blame, fsck, rerere, …) 10 interactors (send-email, p4, svn, …) PLUMBING (63) 19 manipulators (apply, commit-tree, update-ref, …) 21 interrogators (cat-file, for-each-ref, …) 5 syncing (fetch-pack, send-pack, …) 18 internal (check-attr, sh-i18n, …) TOTAL: 145
11. How Well Do You Know Git? PORCELAIN (82) 44 main commands (add, commit, push, pull, …) 11 manipulators (config, reflog, replace, …) 17 interrogators (blame, fsck, rerere, …) 10 interactors (send-email, p4, svn, …) PLUMBING (63) 19 manipulators (apply, commit-tree, update-ref, …) 21 interrogators (cat-file, for-each-ref, …) 5 syncing (fetch-pack, send-pack, …) 18 internal (check-attr, sh-i18n, …) TOTAL: 145
12. How Well Do You Know Git? PORCELAIN (82) 44 main commands (add, commit, push, pull, …) 11 manipulators (config, reflog, replace, …) 17 interrogators (blame, fsck, rerere, …) 10 interactors (send-email, p4, svn, …) PLUMBING (63) 19 manipulators (apply, commit-tree, update-ref, …) 21 interrogators (cat-file, for-each-ref, …) 5 syncing (fetch-pack, send-pack, …) 18 internal (check-attr, sh-i18n, …) TOTAL: 145
13. How Well Do You Know Git? PORCELAIN (82) 44 main commands (add, commit, push, pull, …) 11 manipulators (config, reflog, replace, …) 17 interrogators (blame, fsck, rerere, …) 10 interactors (send-email, p4, svn, …) PLUMBING (63) 19 manipulators (apply, commit-tree, update-ref, …) 21 interrogators (cat-file, for-each-ref, …) 5 syncing (fetch-pack, send-pack, …) 18 internal (check-attr, sh-i18n, …) TOTAL: 145
14. How Well Do You Know Git? PORCELAIN (82) 44 main commands (add, commit, push, pull, …) 11 manipulators (config, reflog, replace, …) 17 interrogators (blame, fsck, rerere, …) 10 interactors (send-email, p4, svn, …) PLUMBING (63) 19 manipulators (apply, commit-tree, update-ref, …) 21 interrogators (cat-file, for-each-ref, …) 5 syncing (fetch-pack, send-pack, …) 18 internal (check-attr, sh-i18n, …) TOTAL: 145
15. How Well Do You Know Git? PORCELAIN (82) 44 main commands (add, commit, push, pull, …) 11 manipulators (config, reflog, replace, …) 17 interrogators (blame, fsck, rerere, …) 10 interactors (send-email, p4, svn, …) PLUMBING (63) 19 manipulators (apply, commit-tree, update-ref, …) 21 interrogators (cat-file, for-each-ref, …) 5 syncing (fetch-pack, send-pack, …) 18 internal (check-attr, sh-i18n, …) TOTAL: 145
16. - There are still an average of 9 commits per day - ~10k commits in the last 3 years - What has been changing? How Well Do You Know Git?
17. - There are still an average of 9 commits per day - ~10k commits in the last 3 years - What has been changing? How Well Do You Know Git?
18. - There are still an average of 9 commits per day - ~10k commits in the last 3 years - What has been changing? How Well Do You Know Git?
19. - There are still an average of 9 commits per day - ~10k commits in the last 3 years - What has been changing? How Well Do You Know Git?
20. - There are still an average of 9 commits per day - ~10k commits in the last 3 years - What has been changing? How Well Do You Know Git? Git is 5 months old 19 years ago
21. - Some helpful config stuff - Oldies but goodies - Some new stuff you may not have noticed - Some big repo / monorepo stuff - Some new GitHub stuff Our Agenda
22. - Some helpful config stuff - Oldies but goodies - Some new stuff you may not have noticed - Some big repo / monorepo stuff - Some new GitHub stuff Our Agenda Shotgun buffet
23. - Some helpful config stuff - Oldies but goodies - Some new stuff you may not have noticed - Some big repo / monorepo stuff - Some new GitHub stuff Our Agenda Shotgun buffet blog.gitbutler.com
24. Some Helpful Con fi g Stuff
25. Some Helpful Con fi g Stuff $ git config - - global alias.staash 'stash -- all'
26. Some Helpful Con fi g Stuff $ git config - - global alias.staash 'stash -- all' All ignored and untracked fi les are also stashed and then cleaned up with git clean.
27. Some Helpful Con fi g Stuff $ git config -- global alias.bb !better-branch.sh https: // gist.github.com/schacon
29. Some Helpful Con fi g Stuff Conditional Configs
33. Some Helpful Con fi g Stuff Conditional Configs
34. - Some helpful config stuff - Oldies but goodies - Some new stuff you may not have noticed - Some big repo / monorepo stuff - Some new GitHub stuff Our Agenda
35. - Some helpful config stuff - Oldies but goodies - Some new stuff you may not have noticed - Some big repo / monorepo stuff - Some new GitHub stuff Our Agenda
36. Oldies But Goodies
37. Oldies But Goodies $ git blame
38. Oldies But Goodies $ git blame -L
39. Oldies But Goodies $ git blame -L just blame a "L"ittle
40. git blame -L 15,26 path/to/file
41. git blame -L 15,26 path/to/file git log -L 15,26:path/to/file
42. git blame -L 15,26 path/to/file git log -L 15,26:path/to/file
43. git blame -L 15,26 path/to/file git log -L 15,26:path/to/file
44. git blame -L 15,26 path/to/file git log -L :File:path/to/file
45. git blame -L 15,26 path/to/file
46. Oldies But Goodies $ git blame -w ignore whitespace
47. Oldies But Goodies $ git blame -w -C ignore whitespace and detect lines moved or copied in the same commit
48. Oldies But Goodies $ git blame -w -C -C ignore whitespace and detect lines moved or copied in the same commit or the commit that created the fi le
49. Oldies But Goodies $ git blame -w -C -C -C ignore whitespace and detect lines moved or copied in the same commit or the commit that created the fi le or any commit at all
50. git blame -L 15,26 path/to/file
51. git blame -w -C -C -C —L 15,26 path/to/file
52. git blame -w -C -C -C —L 15,26 path/to/file
53. git blame -w -C -C -C —L 15,26 path/to/file
54. git blame -w -C -C -C —L 15,26 path/to/file
55. Oldies But Goodies $ git log -S the "pickaxe"
56. git log -S files_watcher -p
57. Oldies But Goodies $ git reflog
59. git pull
60. git reset
61. git checkout
62. git rebase -i
63. Oldies But Goodies $ git diff -- word-diff
68. Oldies But Goodies $ git config - - global rerere.enabled true
69. Oldies But Goodies $ git config - - global rerere.enabled true REuse REcorded REsolution
73. c
77. - Some helpful config stuff - Oldies but goodies - Some new stuff you may not have noticed - Some big repo / monorepo stuff - Some new GitHub stuff Our Agenda
78. - Some helpful config stuff - Oldies but goodies - Some new stuff you may not have noticed - Some big repo / monorepo stuff - Some new GitHub stuff Our Agenda
79. Some New Stuff You May Not Have Noticed
80. Some New Stuff You May Not Have Noticed $ git branch -- column
87. Some New Stuff You May Not Have Noticed $ git push -- force-with-lease
107. Some New Stuff You May Not Have Noticed $ git push -- force-with-lease
108. Some New Stuff You May Not Have Noticed signing commits with ssh
109. Some New Stuff You May Not Have Noticed signing commits with ssh $ git config gpg.format ssh
110. Some New Stuff You May Not Have Noticed signing commits with ssh $ git config gpg.format ssh $ git config user.signingkey ~/.ssh/key.pub
111. Some New Stuff You May Not Have Noticed signing commits with ssh $ git config gpg.format ssh $ git config user.signingkey ~/.ssh/key.pub $ git commit -S
125. Some New Stuff You May Not Have Noticed $ git push - - signed
126. Some New Stuff You May Not Have Noticed $ git push - - signed
127. Some New Stuff You May Not Have Noticed $ git push - - signed
128. Some New Stuff You May Not Have Noticed $ git push - - signed
129. Some New Stuff You May Not Have Noticed $ git maintainance
130. Some New Stuff You May Not Have Noticed $ git maintainance start
132. gc: disabled commit-graph: hourly prefetch: hourly loose-objects: daily incremental-repack: daily pack-refs: none Some New Stuff You May Not Have Noticed
133. - Some helpful config stuff - Oldies but goodies - Some new stuff you may not have noticed - Some big repo / monorepo stuff - Some new GitHub stuff Our Agenda
134. - Some helpful config stuff - Oldies but goodies - Some new stuff you may not have noticed - Some big repo / monorepo stuff - Some new GitHub stuff Our Agenda
135. Big Repo Stuff
136. Big Repo Stuff Windows
137. •approximately 3.5M files that results in a Git repo of about 300 gigabytes in size. •with 4,000 engineers producing 1,760 daily “lab builds” across 440 branches, plus thousands of pull request validation builds. Big Repo Stuff Windows
138. •approximately 3.5M files that results in a Git repo of about 300 gigabytes in size. •with 4,000 engineers producing 1,760 daily “lab builds” across 440 branches, plus thousands of pull request validation builds. Big Repo Stuff Windows
139. •approximately 3.5M files that results in a Git repo of about 300 gigabytes in size. •with 4,000 engineers producing 1,760 daily “lab builds” across 440 branches, plus thousands of pull request validation builds. Big Repo Stuff Windows
140. •approximately 3.5M files that results in a Git repo of about 300 gigabytes in size. •with 4,000 engineers producing 1,760 daily “lab builds” across 440 branches, plus thousands of pull request validation builds. Big Repo Stuff Windows
141. Big Repo Stuff Windows * VFS for Git * Scalar * Git
142. Big Repo Stuff Windows * VFS for Git * Scalar * Git
143. Big Repo Stuff Windows * VFS for Git * Scalar * Git
144. Big Repo Stuff prefetching
146. Big Repo Stuff commit-graph
147. linux, 1.2M commits
148. linux, 1.2M commits
149. linux, 1.2M commits
150. linux, 1.2M commits
151. linux, 1.2M commits
152. linux, 1.2M commits
153. linux, 1.2M commits
154. Big Repo Stuff commit-graph $ git config -- global fetch.writeCommitGraph true
155. Big Repo Stuff filesystem monitor
156. Big Repo Stuff filesystem monitor $ git config core.untrackedcache true $ git config core.fsmonitor true
157. chromium, 470k files
158. chromium, 470k files
159. chromium, 470k files
160. chromium, 470k files
161. chromium, 470k files
163. chromium, 470k files
164. chromium, 470k files chromium, 470k files
165. chromium, 470k files chromium, 470k files
166. partial cloning Big Repo Stuff
167. Big Repo Stuff ❯ git clone https: // github.com/torvalds/linux.git
168. Big Repo Stuff ❯ time git clone https: // github.com/torvalds/linux.git Cloning into 'linux' .. . remote: Enumerating objects: 9982489, done. remote: Counting objects: 100% (14/14), done. remote: Compressing objects: 100% (12/12), done. remote: Total 9982489 (delta 8), reused 4 (delta 2), pack-reused 9982475 Receiving objects: 100% (9982489/9982489), 4.67 GiB | 4.11 MiB/s, done. Resolving deltas: 100% (8153512/8153512), done. Updating files: 100% (83463/83463), done. real 21m32.198s user 6m27.004s sys 3m10.791s
169. Big Repo Stuff ❯ time git clone https: // github.com/torvalds/linux.git Cloning into 'linux' .. . remote: Enumerating objects: 9982489, done. remote: Counting objects: 100% (14/14), done. remote: Compressing objects: 100% (12/12), done. remote: Total 9982489 (delta 8), reused 4 (delta 2), pack-reused 9982475 Receiving objects: 100% (9982489/9982489), 4.67 GiB | 4.11 MiB/s, done. Resolving deltas: 100% (8153512/8153512), done. Updating files: 100% (83463/83463), done. real 21m32.198s user 6m27.004s sys 3m10.791s
170. Big Repo Stuff ❯ git clone -- filter=blob:none
171. Big Repo Stuff ❯ git clone -- filter=blob:none
172. Big Repo Stuff ❯ git clone -- filter=blob:none
173. Big Repo Stuff ❯ time git clone - - filter=blob:none https: / / github.com/torvalds/linux.git Cloning into 'linux-blobless' .. . remote: Enumerating objects: 7255556, done. remote: Counting objects: 100% (13/13), done. remote: Total 7255556 (delta 8), reused 4 (delta 2), pack-reused 7255543 Receiving objects: 100% (7255556/7255556), 1.41 GiB | 7.10 MiB/s, done. Resolving deltas: 100% (5832826/5832826), done. remote: Enumerating objects: 83004, done. remote: Counting objects: 100% (17980/17980), done. remote: Total 83004 (delta 2074), reused 1359 (delta 1359), pack-reused 65024 Receiving objects: 100% (83004/83004), 243.18 MiB | 13.69 MiB/s, done. Updating files: 100% (83463/83463), done. real 4m46.250s user 1m34.593s sys 1m2.973s
174. Big Repo Stuff ❯ time git clone - - filter=blob:none https: / / github.com/torvalds/linux.git Cloning into 'linux-blobless' .. . remote: Enumerating objects: 7255556, done. remote: Counting objects: 100% (13/13), done. remote: Total 7255556 (delta 8), reused 4 (delta 2), pack-reused 7255543 Receiving objects: 100% (7255556/7255556), 1.41 GiB | 7.10 MiB/s, done. Resolving deltas: 100% (5832826/5832826), done. remote: Enumerating objects: 83004, done. remote: Counting objects: 100% (17980/17980), done. remote: Total 83004 (delta 2074), reused 1359 (delta 1359), pack-reused 65024 Receiving objects: 100% (83004/83004), 243.18 MiB | 13.69 MiB/s, done. Updating files: 100% (83463/83463), done. real 4m46.250s user 1m34.593s sys 1m2.973s Commits and Trees WD Blobs
175. Big Repo Stuff ❯ git clone -- filter=tree:0
176. Big Repo Stuff ❯ git clone -- filter=tree:0
177. Big Repo Stuff ❯ time git clone - - filter=tree:0 https: // github.com/torvalds/linux.git Cloning into 'linux-treeless' . .. remote: Enumerating objects: 1249970, done. remote: Counting objects: 100% (2/2), done. remote: Total 1249970 (delta 0), reused 2 (delta 0), pack-reused 1249968 Receiving objects: 100% (1249970/1249970), 637.40 MiB | 11.69 MiB/s, done. remote: Enumerating objects: 5447, done. remote: Counting objects: 100% (2376/2376), done. remote: Total 5447 (delta 4), reused 2 (delta 2), pack-reused 3071 Receiving objects: 100% (5447/5447), 2.57 MiB | 10.76 MiB/s, done. remote: Enumerating objects: 83004, done. remote: Counting objects: 100% (17984/17984), done. remote: Total 83004 (delta 2052), reused 1336 (delta 1336), pack-reused 65020 Receiving objects: 100% (83004/83004), 243.19 MiB | 10.58 MiB/s, done. Updating files: 100% (83463/83463), done. real 2m2.138s user 0m35.061s sys 0m18.005s
178. Big Repo Stuff ❯ time git clone - - filter=tree:0 https: // github.com/torvalds/linux.git Cloning into 'linux-treeless' . .. remote: Enumerating objects: 1249970, done. remote: Counting objects: 100% (2/2), done. remote: Total 1249970 (delta 0), reused 2 (delta 0), pack-reused 1249968 Receiving objects: 100% (1249970/1249970), 637.40 MiB | 11.69 MiB/s, done. remote: Enumerating objects: 5447, done. remote: Counting objects: 100% (2376/2376), done. remote: Total 5447 (delta 4), reused 2 (delta 2), pack-reused 3071 Receiving objects: 100% (5447/5447), 2.57 MiB | 10.76 MiB/s, done. remote: Enumerating objects: 83004, done. remote: Counting objects: 100% (17984/17984), done. remote: Total 83004 (delta 2052), reused 1336 (delta 1336), pack-reused 65020 Receiving objects: 100% (83004/83004), 243.19 MiB | 10.58 MiB/s, done. Updating files: 100% (83463/83463), done. real 2m2.138s user 0m35.061s sys 0m18.005s
179. Big Repo Stuff ❯ time git clone - - filter=tree:0 https: // github.com/torvalds/linux.git Cloning into 'linux-treeless' . .. remote: Enumerating objects: 1249970, done. remote: Counting objects: 100% (2/2), done. remote: Total 1249970 (delta 0), reused 2 (delta 0), pack-reused 1249968 Receiving objects: 100% (1249970/1249970), 637.40 MiB | 11.69 MiB/s, done. remote: Enumerating objects: 5447, done. remote: Counting objects: 100% (2376/2376), done. remote: Total 5447 (delta 4), reused 2 (delta 2), pack-reused 3071 Receiving objects: 100% (5447/5447), 2.57 MiB | 10.76 MiB/s, done. remote: Enumerating objects: 83004, done. remote: Counting objects: 100% (17984/17984), done. remote: Total 83004 (delta 2052), reused 1336 (delta 1336), pack-reused 65020 Receiving objects: 100% (83004/83004), 243.19 MiB | 10.58 MiB/s, done. Updating files: 100% (83463/83463), done. real 2m2.138s user 0m35.061s sys 0m18.005s Commits WD Trees WD Blobs
180. Big Repo Stuff ❯ time git blame lib/bootconfig.c remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.95 KiB | 1.98 MiB/s, done. remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.95 KiB | 1.98 MiB/s, done. remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.62 KiB | 2.81 MiB/s, done. remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.95 KiB | 2.98 MiB/s, done. remote: Enumerating objects: 1, done.
181. Big Repo Stuff ❯ time git blame lib/bootconfig.c remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.95 KiB | 1.98 MiB/s, done. remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.95 KiB | 1.98 MiB/s, done. remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.62 KiB | 2.81 MiB/s, done. remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.95 KiB | 2.98 MiB/s, done. remote: Enumerating objects: 1, done.
182. Big Repo Stuff ❯ time git blame lib/bootconfig.c remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.95 KiB | 1.98 MiB/s, done. remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.95 KiB | 1.98 MiB/s, done. remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.62 KiB | 2.81 MiB/s, done. remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.95 KiB | 2.98 MiB/s, done. remote: Enumerating objects: 1, done.
183. Big Repo Stuff ❯ time git blame lib/bootconfig.c remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.95 KiB | 1.98 MiB/s, done. remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.95 KiB | 1.98 MiB/s, done. remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.62 KiB | 2.81 MiB/s, done. remote: Enumerating objects: 1, done. remote: Counting objects: 100% (1/1), done. remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (1/1), 5.95 KiB | 2.98 MiB/s, done. remote: Enumerating objects: 1, done.
184. Big Repo Stuff linux ❯ time git blame lib/nlattr.c >/dev/null 2>/dev/null real 0m4.592s user 0m1.241s sys 0m0.501s linux-blobless ❯ time git blame lib/nlattr.c >/dev/null 2>/dev/null real 0m45.873s user 0m4.550s sys 0m3.209s
185. Big Repo Stuff multipack indexes and reachability bitmaps and geometric repacking https: / / github.blog/2021-04-29-scaling-monorepo-maintenance/
186. Monorepo Stuff
187. Monorepo Stuff sparse-checkout
188. ❯ time git status On branch main Your branch is up to date with 'origin/main'. nothing to commit, working tree clean real 0m5.931s ❯ git sparse-checkout set build base ❯ time git status On branch main Your branch is up to date with 'origin/main'. You are in a sparse checkout with 2% of tracked files present. nothing to commit, working tree clean real 0m0.386s
189. ❯ time git status On branch main Your branch is up to date with 'origin/main'. nothing to commit, working tree clean real 0m5.931s ❯ git sparse-checkout set build base ❯ time git status On branch main Your branch is up to date with 'origin/main'. You are in a sparse checkout with 2% of tracked files present. nothing to commit, working tree clean real 0m0.386s
190. ❯ time git status On branch main Your branch is up to date with 'origin/main'. nothing to commit, working tree clean real 0m5.931s ❯ git sparse-checkout set build base ❯ time git status On branch main Your branch is up to date with 'origin/main'. You are in a sparse checkout with 2% of tracked files present. nothing to commit, working tree clean real 0m0.386s
191. ❯ time git status On branch main Your branch is up to date with 'origin/main'. nothing to commit, working tree clean real 0m5.931s ❯ git sparse-checkout set build base ❯ time git status On branch main Your branch is up to date with 'origin/main'. You are in a sparse checkout with 2% of tracked files present. nothing to commit, working tree clean real 0m0.386s
192. - Some helpful config stuff - Oldies but goodies - Some new stuff you may not have noticed - Some big repo / monorepo stuff - Some new GitHub stuff Our Agenda
193. - Some helpful config stuff - Oldies but goodies - Some new stuff you may not have noticed - Some big repo / monorepo stuff - Some new GitHub stuff Our Agenda
194. GitHub Stuff
195. GitHub Stuff allowed merge types
196. GitHub Stuff allowed merge types
197. GitHub Stuff allowed merge types
198. GitHub Stuff allowed merge types
199. GitHub Stuff auto merge
200. GitHub Stuff auto merge
201. GitHub Stuff auto merge
202. GitHub Stuff merge queue
207. GitHub Stuff refs/pull /*
208. $ git ls-remote 593c09ffa229592be6247338a39cce09085aaee6 refs/heads/inertia 95ac6279f06baa7535e2d084df05cf9d0065e64b refs/heads/master ad8b29eeb8ff141cb06b2819d277bedd3aa358a9 refs/heads/new-vector-cl e37d20595e0c55fd4ab1b28e6ad195100dacd42c refs/heads/remote-vector dc29ff8048689b25a5384a567a7b70264ebc63f9 refs/pull/220/head 99daa15a96073549e11d4fe5a1ee3ef27e95e199 refs/pull/221/head 3a171b4261728292805160fca87e2c901b3e9110 refs/pull/222/head 59e4fa4373be1b062fcd01c559ffcbfac73a7900 refs/pull/223/head 6358f1136de48bf22f244a60429502b85b8553b1 refs/pull/223/merge ec54ea7fcd11d820b6df61f63a3d6c0215db0128 refs/pull/224/head 9af6be7cb29806c788f8ee1c757696671cda8727 refs/pull/225/head 93ef792cde39c7c79d4fcda099321edc872369c4 refs/pull/226/head 97f570af65aa72677b278b3e0c5a5d3c0efdc04a refs/pull/227/head 340a38f8e140c2379b2d51507939dda9a7c88911 refs/pull/227/merge 27300a34fb5276f2ac92d90429bce8d0c6a679ef refs/pull/228/head
209. $ git ls-remote 593c09ffa229592be6247338a39cce09085aaee6 refs/heads/inertia 95ac6279f06baa7535e2d084df05cf9d0065e64b refs/heads/master ad8b29eeb8ff141cb06b2819d277bedd3aa358a9 refs/heads/new-vector-cl e37d20595e0c55fd4ab1b28e6ad195100dacd42c refs/heads/remote-vector dc29ff8048689b25a5384a567a7b70264ebc63f9 refs/pull/220/head 99daa15a96073549e11d4fe5a1ee3ef27e95e199 refs/pull/221/head 3a171b4261728292805160fca87e2c901b3e9110 refs/pull/222/head 59e4fa4373be1b062fcd01c559ffcbfac73a7900 refs/pull/223/head 6358f1136de48bf22f244a60429502b85b8553b1 refs/pull/223/merge ec54ea7fcd11d820b6df61f63a3d6c0215db0128 refs/pull/224/head 9af6be7cb29806c788f8ee1c757696671cda8727 refs/pull/225/head 93ef792cde39c7c79d4fcda099321edc872369c4 refs/pull/226/head 97f570af65aa72677b278b3e0c5a5d3c0efdc04a refs/pull/227/head 340a38f8e140c2379b2d51507939dda9a7c88911 refs/pull/227/merge 27300a34fb5276f2ac92d90429bce8d0c6a679ef refs/pull/228/head
210. $ git ls-remote 593c09ffa229592be6247338a39cce09085aaee6 refs/heads/inertia 95ac6279f06baa7535e2d084df05cf9d0065e64b refs/heads/master ad8b29eeb8ff141cb06b2819d277bedd3aa358a9 refs/heads/new-vector-cl e37d20595e0c55fd4ab1b28e6ad195100dacd42c refs/heads/remote-vector dc29ff8048689b25a5384a567a7b70264ebc63f9 refs/pull/220/head 99daa15a96073549e11d4fe5a1ee3ef27e95e199 refs/pull/221/head 3a171b4261728292805160fca87e2c901b3e9110 refs/pull/222/head 59e4fa4373be1b062fcd01c559ffcbfac73a7900 refs/pull/223/head 6358f1136de48bf22f244a60429502b85b8553b1 refs/pull/223/merge ec54ea7fcd11d820b6df61f63a3d6c0215db0128 refs/pull/224/head 9af6be7cb29806c788f8ee1c757696671cda8727 refs/pull/225/head 93ef792cde39c7c79d4fcda099321edc872369c4 refs/pull/226/head 97f570af65aa72677b278b3e0c5a5d3c0efdc04a refs/pull/227/head 340a38f8e140c2379b2d51507939dda9a7c88911 refs/pull/227/merge 27300a34fb5276f2ac92d90429bce8d0c6a679ef refs/pull/228/head
211. $ git ls-remote 593c09ffa229592be6247338a39cce09085aaee6 refs/heads/inertia 95ac6279f06baa7535e2d084df05cf9d0065e64b refs/heads/master ad8b29eeb8ff141cb06b2819d277bedd3aa358a9 refs/heads/new-vector-cl e37d20595e0c55fd4ab1b28e6ad195100dacd42c refs/heads/remote-vector dc29ff8048689b25a5384a567a7b70264ebc63f9 refs/pull/220/head 99daa15a96073549e11d4fe5a1ee3ef27e95e199 refs/pull/221/head 3a171b4261728292805160fca87e2c901b3e9110 refs/pull/222/head 59e4fa4373be1b062fcd01c559ffcbfac73a7900 refs/pull/223/head 6358f1136de48bf22f244a60429502b85b8553b1 refs/pull/223/merge ec54ea7fcd11d820b6df61f63a3d6c0215db0128 refs/pull/224/head 9af6be7cb29806c788f8ee1c757696671cda8727 refs/pull/225/head 93ef792cde39c7c79d4fcda099321edc872369c4 refs/pull/226/head 97f570af65aa72677b278b3e0c5a5d3c0efdc04a refs/pull/227/head 340a38f8e140c2379b2d51507939dda9a7c88911 refs/pull/227/merge 27300a34fb5276f2ac92d90429bce8d0c6a679ef refs/pull/228/head
212. ❯ git config remote.origin.fetch '+refs/pull /* :refs/remotes/origin/pull / * ' ❯ git fetch remote: Enumerating objects: 23, done. remote: Counting objects: 100% (23/23), done. remote: Compressing objects: 100% (12/12), done. remote: Total 23 (delta 12), reused 16 (delta 11), pack-reused 0 Unpacking objects: 100% (23/23), 11.47 KiB | 1.04 MiB/s, done. From github.com:gitbutlerapp/web * [new ref] refs/pull/100/head - > origin/pull/100/head * [new ref] refs/pull/101/head - > origin/pull/101/head * [new ref] refs/pull/102/head - > origin/pull/102/head * [new ref] refs/pull/103/head - > origin/pull/103/head * [new ref] refs/pull/104/head - > origin/pull/104/head * [new ref] refs/pull/105/head - > origin/pull/105/head * [new ref] refs/pull/106/head - > origin/pull/106/head * [new ref] refs/pull/107/head - > origin/pull/107/head * [new ref] refs/pull/108/head - > origin/pull/108/head * [new ref] refs/pull/109/head - > origin/pull/109/head
213. ❯ git config remote.origin.fetch '+refs/pull /* :refs/remotes/origin/pull / * ' ❯ git fetch remote: Enumerating objects: 23, done. remote: Counting objects: 100% (23/23), done. remote: Compressing objects: 100% (12/12), done. remote: Total 23 (delta 12), reused 16 (delta 11), pack-reused 0 Unpacking objects: 100% (23/23), 11.47 KiB | 1.04 MiB/s, done. From github.com:gitbutlerapp/web * [new ref] refs/pull/100/head - > origin/pull/100/head * [new ref] refs/pull/101/head - > origin/pull/101/head * [new ref] refs/pull/102/head - > origin/pull/102/head * [new ref] refs/pull/103/head - > origin/pull/103/head * [new ref] refs/pull/104/head - > origin/pull/104/head * [new ref] refs/pull/105/head - > origin/pull/105/head * [new ref] refs/pull/106/head - > origin/pull/106/head * [new ref] refs/pull/107/head - > origin/pull/107/head * [new ref] refs/pull/108/head - > origin/pull/108/head * [new ref] refs/pull/109/head - > origin/pull/109/head
214. ❯ git config remote.origin.fetch '+refs/pull /* :refs/remotes/origin/pull / * ' ❯ git fetch remote: Enumerating objects: 23, done. remote: Counting objects: 100% (23/23), done. remote: Compressing objects: 100% (12/12), done. remote: Total 23 (delta 12), reused 16 (delta 11), pack-reused 0 Unpacking objects: 100% (23/23), 11.47 KiB | 1.04 MiB/s, done. From github.com:gitbutlerapp/web * [new ref] refs/pull/100/head - > origin/pull/100/head * [new ref] refs/pull/101/head - > origin/pull/101/head * [new ref] refs/pull/102/head - > origin/pull/102/head * [new ref] refs/pull/103/head - > origin/pull/103/head * [new ref] refs/pull/104/head - > origin/pull/104/head * [new ref] refs/pull/105/head - > origin/pull/105/head * [new ref] refs/pull/106/head - > origin/pull/106/head * [new ref] refs/pull/107/head - > origin/pull/107/head * [new ref] refs/pull/108/head - > origin/pull/108/head * [new ref] refs/pull/109/head - > origin/pull/109/head
215. ❯ git pull origin pull/220/head From github.com:gitbutlerapp/web * branch refs/pull/220/head -> FETCH_HEAD Already up to date.
216. GitButler gitbutler.com
217. GitButler
224. Thank you! Be sure to let us buy you a beer at our drinkup tonight! Le Waff, 6p
225. ?????? Be sure to let us buy you a beer at our drinkup tonight! Le Waff, 6p
226. Any Questions? Be sure to let us buy you a beer at our drinkup tonight! Le Waff, 6p