ฝัง
- เผยแพร่เมื่อ 11 พ.ค. 2024
- Scott Chacon's FOSDEM 2024 talk on Git Tips and Tricks.
Scott talks about:
00:00 - Introduction
01:06 - About Me (well, Scott Chacon)
02:36 - How Well Do You Know Git?
05:09 - Our Agenda
06:25 - Some Helpful Config Stuff
09:42 - Oldies But Goodies
16:22 - Some New Stuff (You May Not Have Noticed)
23:48 - Some Big Repo Stuff / Monorepo Stuff
33:29 - Some New Github Stuff
35:54 - GitButler
36:50 - End of talk
37:03 - Start of Q&A Session
37:06 - Q: Why does GitHub not do git range diff?
38:28 - Q: Why do submodules suck everywhere?
40:16 - Q: With SSH signing, is it possible to specify more than one key?
40:42 - Q: Why can't --force-with-lease be the default force?
42:33 - Q: If you were back on the Git development team, what direction would you like to see it move in?
44:58 - Q: We all love the Git CLI - but do you ever use any visual tools?
46:41 - That's all folks!-
Read the blog series based on this talk here: blog.gitbutler.com/
![[TH] 2024 PMSL SEA W1D3 | Summer | เคาะ 8 ทีมแรก ที่ไปรอวันอาทิตย์](http://i.ytimg.com/vi/eKFbDC1qe38/mqdefault.jpg)
I know I don't know git, that's why whenever I have to do something new I research it for 30 minutes and then make a script so I don't have to do that again. Mad respect to all y'all who somehow find the time to master git and all the other devops wizardry on top of learning your language of choice.
If someone has the confidence to say they know git, I'd be scared of them. They're too powerful
I think for a lot of people it's less about time and more about version control being this necessary evil we have to deal with when really we just want to write code.
I'll spend hours learning programming languages that I'm never going to actually use instead of spending that time reading a manual on the version control that I use every day.
I'm currently trying to convince myself that it is one of those things that are more fun once you actually know it.
@@whannabi or lying to themselves.
Try out GitButler, maybe it's a nice compromise. :)
I have found my people @@mr.mister311
"fucking nerds...". Golden
😂 family looked at me weird laughing my butt off
Indeed xd
Honestly, I find using it via the terminal much simpler lol
hahaha what a joke hahaha😲
My favorite part 😂✨
Timestamps for dorks:
00:00 - Introduction
01:06 - About Me (well, Scott Chacon)
02:36 - How Well Do You Know Git?
05:09 - Our Agenda
06:25 - Some Helpful Config Stuff
09:42 - Oldies But Goodies
16:22 - Some New Stuff (You May Not Have Noticed)
23:48 - Some Big Repo Stuff / Monorepo Stuff
33:29 - Some New Github Stuff
35:54 - GitButler
36:50 - End of talk
37:03 - Start of Q&A Session
37:06 - Q: Why does GitHub not do git range diff?
38:28 - Q: Why do submodules suck everywhere?
40:16 - Q: With SSH signing, is it possible to specify more than one key?
40:42 - Q: Why can't --force-with-lease be the default force?
42:33 - Q: If you were back on the Git development team, what direction would you like to see it move in?
44:58 - Q: We all love the Git CLI - but do you ever use any visual tools?
46:41 - That's all folks!-
Awesome! We're stealing this and updating the description. Thanks for the hard work!
@@gitbutlerappthe sarcasm lmao
You are real MVP
@@gitbutlerapphow to save work :) xD
can you pin this comment? @@gitbutlerapp
Suggestion: add chapters (timestamps) to this video. It really helps when you're watching for the second time!
If someone adds the chapters as a comment, I think youtube might catch them automagically
ask and ye shall receive. timestamps up above (or below... or wherever my comment ended up floating to.)
@@nlovelldev tysm
x
Great talk, I really appreciate the "shotgun" style presentation - it cuts the crap while keeping it clear.
I don't know if it's ADHD, but my brain goes so well on this type of content where normally I struggle to follow presentations.
@@MHLuttekesI struggle with this too, my guess is because these style of presentation just keeps bombarding you with information so you’re more inclined to stay focused.
Whereas usual presentation are sprinkled with useless fluff that makes you “turn off” your brain for a while and “turn on” again when the important bits were presented
I also like he goes directly to the point instead of talking during 10 minutes with an history about versioning systems...
It's better to watch it later (vs. live). I have to pause the video, take notes, and think about how it would apply to my job if I want the info to stick.
This is a great presentation, though. There is zero fat here.
The excitement level of this guy is priceless. Imagine working with him in a team!
The talk is great, but the manner of it being presented is even better!
Excellent talk! After many years on TH-cam this made me create a new playlist of videos I need to rewatch regularly. The bar has been set pretty high!
Really excellent talk. Incredible pacing, funny, and lots to learn for folks at every level.
Fantastic speech! Thank you, Scott. So many cool things about Git.
`git blame -C -C -C` is pure gold. But wait, there's more!
From `GIT-BLAME(1)`
-C[]
In addition to -M, detect lines moved or copied from other files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, the command additionally looks for copies from other files in the commit that creates the file. When this option is given three times, the command additionally looks for copies from other files in any commit.
is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying between files for it to associate those lines with the parent commit. And the default value is 40. If there are more than one -C options given, the argument of the last -C will take effect.
If anyone has any questions or suggestions for the next version of this talk, we would love to hear them!
More about CRDT stuff :)
Close the cameraman in a closet before next talk.
On a serious note, stacked PRs could be a nice topic.
@@ivanbessarabov690 interesting, we could do more on that. :)
I’m at half and you haven’t made a demo of *git-bisect* with a 300GB repository yet ;)
Next to being an informative talk, the way it's presented is great. Good job on that presentation skills!
10 out of 10
So excited to share this with my boss Mike, he's our local Git wizard and I'm so thankful for him. He's always so excited to share the new things he's learned and I'm looking forward to paying it forward!
looking forward to gitbutler.
awesome talk!!
Fantastic presentation!
Scott Chacon is a legend! I learned git in 2016, and I love it, it's one of the most important tools for me, after start my journey as a developer, I start to teach git, and the best resource always was the Pro Git book.
Didn't know that guy before, immediately caught fire because of his excitement, bought his book after the first 10 minutes. Great talk!
Time 8:13 - Setting or defining work and oss (open source software) directories. Thank you, Scott!
What a great talk. Thanks :)
Thanks for a great talk. Gonna be using git column all the time XD
Thanks for the book. It saved my neck in 2011. Every intern I've had since 2012, on their first day, I give them the book and ask them to read it all, and do all the exercises. I give them paper so they can mark it up as needed. Every intern that does this, has no issues with git all summer. The one or two interns that did not do the exercises? They struggle. Great book!
I haven't watched the video yet but it would be useful if you'd put book's name into your comment so people can look it up right away.
@@ghos7bear It is the "Pro Git" book you can find for free with a search engin of your choice
Pro Git 2nd ed. Edition by Scott Chacon -- just do every exercise and try every command, even if it's boring or you have done it before. That's what we learned over 10y of interns.
lmfao, you ask every intern to read a 500 page book for a summer internship? try not to respond with: "yeah I work at a super awesome place and im so smart, try putting a little more work in kiddo, pull up your bootstraps etc etc"
@@ronminnichhope you at least pay them for that lmao seems like a shitty workplace ngl. I have never had any problems with git and I didn’t get forced to read a 500 page book. If I wonder something I’ll just google it. Takes 3s
10:59 that -L to blame and log is awesome!
Wow. What a great presentation. Thank you very much.
just pluggin git butler shortly, well done! Real-world git goodies, love it.
I was there, great talk! Made me discover GirButler, super promising!!
I'm impressed you made the cut. I saw them ushering a hundred people out :)
Those packed aisles would have been a fire warden's nightmare.
@@jasonhenson7948 They kicked everyone out who did not have a seat before the talk started. We were sad, but the fire warden would have remained happy.
Found this fun and informative... love the Sneakers reference too.
That was fantastic!!
Great talk! So many new gems to add to my workflow
I was supposed to go to Fosdem, but family business took priority. Thanks for uploading!
Neat. Learned a few things. Thanks.
I realy love the pro git book and Im so happy that I found this vid 😊
"Raise your hand if you never used anything other than Git" ... BRB feeling old.
Tell me about it.
@@gitbutlerapp 2x three letters: SVN, and FTP. 🥳
I feel actual anxiety when I recall the days of CVS and SVN. Man, those were horrible.
I still use RCS for personal projects involving a single file. For multi-file projects that I'm not making available publicly I'm more likely to use SVN . I started using git only because I was working on some Open Source Projects that used it. I don't like git that much. It is the only VCS that has resulted in me losing some work I had done but not commmited.
Svn and mercurial, thanks to mozilla
I loved your "Ask your code" talk back at Code.Talks and I love this one even more!
Holy shit that git butler idea is great, I've always wanted to work on several branches intermittently
Great video thanks 🎉😊
Virtual branches are an amazing feature.
There are so many times I've been working on a branch and seen a minor fix in a file unrelated to my work.
Streamlining those fixes while keeping them separate from my branches is very efficient for everyone.
Waht a great talk. I have same frustrating about that part of git does not record all the shit for me.
That intro music is an absolute banger.
can you give me name of that song?
@@hunghai6378Billy Billy - Yarin Primak th-cam.com/video/QLhGt0ejEjQ/w-d-xo.html
@@gitbutlerapp thank you so much
Youre a great speaker!
Thanks!
@@gitbutlerappYou did had a typo at least once ;P It's `git maintenance start` not maintainance. But I forgive you.
00:28 🎙 Scott Chacon introduces himself as a co-founder of GitHub and author of "Pro Git," discussing his history with Git and current projects.
02:27 🛠 Git has approximately 145 commands, categorized into main, manipulator, interrogator, interactor, and plumbing commands, with 44 main ones commonly used for tasks like add, commit, push, and pull.
04:23 🔄 Scott Chacon aims to refresh users on Git fundamentals and introduce new features added in the last three years, as many users may not be aware of recent updates despite Git's continual development.
06:21 🛠 Scott Chacon suggests setting up aliases for frequently used Git commands to enhance efficiency and shares tips on configuring Git globally or for specific repositories.
08:39 📝 Git's includeIf directive allows users to set up different configurations for specific directories, offering flexibility in managing work and open-source projects with distinct settings.
10:33 📊 Scott Chacon discusses helpful Git commands such as blame, log -L, and log -S, providing insights into tracking changes and understanding code history efficiently.
13:26 🛠 Utilizing options like --ignore-space-change and --ignore-all-space with blame command helps in better attributing code changes and understanding code evolution accurately.
14:55 📝 git diff --word-diff provides a word-based diff, enhancing clarity when reviewing changes, especially in code with complex formatting like CSS frameworks.
15:47 🔀 git rerere enables automatic resolution of recurring merge conflicts, streamlining workflows during operations like rebasing or cherry-picking, with minimal configuration overhead.
17:43 ⚠ Force with lease: A safer alternative to force pushing in Git, preventing accidental overwrites of others' changes.
19:36 🔏 Signing commits with SSH: Git now supports signing commits with SSH keys, providing an alternative to GPG for commit verification.
22:27 🛠 Git maintenance: Running git maintenance start improves repository performance by scheduling background maintenance tasks.
24:26 📁 Support for large repositories: Efforts by Microsoft have enhanced Git's support for large repositories, making operations faster and more efficient.
30:10 🔄 Partial cloning: Git allows filtering out blobs during cloning for faster downloads of large repositories, with options for selective data retrieval.
32:32 🗃 Sparse checkout: Useful for mono repositories, enabling selective checkout of specific directories, reducing overhead and improving performance.
33:57 🚀 GitHub features: GitHub offers options for enforcing merge standards, auto-merging, merge queues, and linear history requirements, enhancing collaboration and workflow management.
35:23 🔍 GitHub repositories allow fetching pull requests directly as refs, simplifying the process of merging contributions.
36:20 🔄 GitButler introduces virtual branches, enabling simultaneous work on multiple branches without needing to stash changes or switch branches.
37:44 🛠 GitHub's feature set reflects common workflows, which may explain why it lacks certain functionalities like Git range diff.
39:36 📦 Many are shifting towards mono repositories to mitigate submodule complexities, but it doesn't cover all cases.
40:33 🔑 Git allows specifying multiple SSH keys for signing commits, enhancing security.
41:32 🔄 Git prioritizes backward compatibility, maintaining consistency over introducing potentially disruptive changes.
43:01 🛠 Desired Git features include working on multiple branches simultaneously and automatic recording of changes to prevent data loss.
44:25 🔄 Git's evolution is influenced by its origins in patch-based workflows, limiting major user interface changes despite potential for innovation.
🎯 Key Takeaways for quick navigation:
🛠️ Git configuration: Learn to set up aliases using `alias` and `git config` for better workflow customization.
🕵️ Git Blame: Utilize `git blame` with options like `-L` and `-w` to get detailed information about changes in specific lines and ignore whitespace.
🔄 Git Log Options: Explore options like `-S` for pickaxe search and `--word-diff` for word-based diffs in `git log`.
📜 Git Reflog: Leverage `git reflog` to view a log of reference updates, helpful for tracking changes, especially after operations like reset.
🔄 Reuse Recorded Resolution (`rerere`): Enable and use `rerere` to automatically handle recurring merge conflicts, saving time during rebases and cherry-picking.
🌐 New Git Branch Options: Discover the `--column` and `branch.sort` options for `git branch` to enhance the display of branch information.
🌟 Git Column Command: Learn about the new `git column` command, a simple tool to format input into columns.
🚫 Force with Lease: Familiarize yourself with the `force-with-lease` option, a safer alternative to force pushes, preventing accidental overwrites of others' changes.
🔄 Force with Lease: A safer option for force pushing in Git. It checks for stale references before pushing, making it useful for scenarios like rebasing or amending commits.
🔐 Signing Commits with SSH: Git now supports signing commits using SSH instead of GPG. This is beneficial for those facing issues with GPG and provides a similar level of security.
🛠️ Git Maintenance: Running `Git maintenance start` in your repository adds a cron job for background maintenance tasks, improving overall performance by optimizing tasks like commit graph generation and loose object collection.
📂 Large Repository Handling: Tips for handling enormous repositories, with insights from Microsoft's efforts in making Git work well for large projects like Windows. This includes features like prefetching, commit graph, file system monitoring, and partial cloning.
🏗️ Sparse Checkout: Useful for monorepos, sparse checkout allows you to clone specific directories, reducing the amount of data fetched and improving performance.
🔄 GitHub Merge Options: GitHub offers various merge types like merge commits, rebasing, and squash merging. You can enforce these standards and auto-merge pull requests based on CI status.
📝 Linear History Requirement on GitHub: GitHub allows you to enforce a linear history, rejecting pushes with merge commits. This is useful for maintaining a clean and straightforward project history.
🔄 Pull Requests with Heads: Pull requests on GitHub have corresponding refs, enabling you to pull down and merge changes directly, providing an alternative to using the GitHub interface for merging.
🔄 GitHub allows fetching from various refs directly, not just adding remotes for pull requests.
🌿 GitButler introduces virtual branches, enabling simultaneous work on multiple branches without switching.
🚀 Virtual branches in GitButler facilitate handling features and bug fixes separately without commits into the feature branch.
❓ A question is raised about Git range diff, with the speaker suggesting it's not widely used in typical workflows.
🔄 Submodules are criticized for their limitations, and the trend is shifting towards mono repos for better project management.
🛠️ Suggestions for Git improvement include the ability to work on multiple branches simultaneously and automatic recording of all changes.
🚀 The speaker discusses their preferences for using both command line and GUIs, depending on the task, with command line being faster for most operations.
🤔 Future directions for Git are explored, with emphasis on improving the user experience for modern workflows, such as multi-branch development and comprehensive change tracking.
Awesome talk!
I enjoy this talk. Thank you.
46:30 I've been using Git for a long time and I use git gui for building my commit because I always commit lines of code, not full files. And I also use gitk for reviewing history of the code unless I'm looking for some highly specific thing that gitk doesn't support well - for those cases it's mostly `git log -p - - optional/path/limit` and grepping the results if needed. (The dashes should obviously be combined without a space but TH-cam comment interface cannot display that string correctly.)
I was kinda hoping he would talk about git worktrees, I use those to checkout branches into separate file paths on my computer which allows me to work in different branches simultaneously. And I can keep long-lived branches separate. This also integrates really well with vscode workspaces.
Best use for GUI Git has to be staging and unstaging parts of a file. In VS Code, just select some lines in the diff view and right-click. Stage selection and unstage selection. Amazing! 😊
Really nice talk. Thanks :)
I didn't know about range diff. I do the same thing manually because I didn't realise there was a tool for that :)
Whoah that virtual branch stuff is exactly what I was looking for I expected you needed something like Pijul for that
Fantastic!
really an amazing speech. thanks
Appreciated the Sneakers reference.
Great talk, I really enjoyed. I was wondering if the virtual branch is something different to what you can achieve with `git worktree add ` ? Amazing, helpful talk. Thanks
It is for the same problem, but an important difference. Worktrees give you a different working directory per branch, so if you have a feature and a bugfix, you don't have anywhere where you have _both_ the feature and the bugfix in one direcotry at the same time. With GitButler you do them both in the same directory and make branches from the hunks as though you were `git add -i` each hunk and committing.
In other words, we keep the work of the two branches separated in memory rather than on disk.
This is very nice if you want to see how branches will work together before they're technically merged in git.
@@gitbutlerapp thank you for the explanation. It makes sense and it's an awesome feature to have.
Awesome talk! But I was looking forward to hear about "git worktree" too.
Very nice talk, I like his energy on the topic we all use all day!
Is there any source for the intro song?
TL;DW: Git is DIY version control. The less you know about git, the less likely you are to accidentally corrupt your repository. The safest way to use git is to each time, check out a fresh copy of your project, make your edits, and check it back in. Minimize the likelihood of repository corruption by making sure no one else checks out your project at the same time you're making changes. Keep archived copies of your project tree around locally and make multiple backups to be sure.
thank youuuuuu I just instantly subscribed
Fantastic talk!
Awesome intro 👏
Great session
Wow, what a great talk! I'll add it to my collection of Git learning materials!
Git learning material???? REALLY? Aren't they more important things to learn in the whole world of IT????? LMAO
@@MJ-xg2ow there are many important things. But being dumb and unable to use major everyday tools is not the solution.
"Unable" to use major tools??? Wasting time to use git blame in cmd line to look cool while it's a click away is being Unable to learn everyday tool? I can't live without cmd myself but this is not the type of stuff one use cmd line to make their life easier....
This is the first time I heard of porcelain commands. A quick google and... it makes sense! Part of most software is plumbing that has to work, but is ugly, and not everyday user-facing code. The nice user-interfacing stuff is porcelain.
banger talk
"my voice is my passport, verify me" -- I love the reference! :D
You are hilarious!!!!!! In the positive way !!!!
13:01 WOW! That's the way to use blame!
I love the interactive add mention - seriously one of the three things I use `tig` for.
the GUI vs CLI debate, I never think about that anymore since I started using Magit.
Nice talk, thanks
Excellent!
Great. video
What a fun talk!
only thing I know for sure that was added recently was more a change, the default from 'master' to 'main' (about time!)
Great lecture. Could you please share what command you used at 7:50 as bb alias to print this nice version of the branches
43:10 - Working on multiple branches at the same time / multiple indexes, heads: Isn't that what `git worktree` does? I use it quite a bit, especially if I need to make a change to one branch while I have a bunch of other uncommitted changes in my main working tree.
I also use submodules - I have a lot of 3D printing projects using OpenSCAD, and I've developed a common library of functions / transformations / etc. Since OpenSCAD doesn't have a package management / dependency system like Python or NPM, I just add my common library as a submodule to each individual project.
ooh git butler looks dope
Great video
Hehe. Starting to watch the video. I am using git for 15 years (and before that hg, perforce, svn, cvs), and I would say I do not know git even on the surface. I know more about git in my company than anybody else probably, but I still would say I do not know git. And I do not want to know it.
I know we're doing a git client, but I do have to say that git is amazing :)
Same here plus sourcesafe, clearcase and tfs. Used hg for many years, wrote many extensions for it, even up-streamed some fixes in the early days when windows support was shaky. Git is the best by far.
Thanks
thanks!
I do a lot of code review and have been saved by reflog more than I care to admit 😅
I jump between branches a lot and sometimes mix up where I should commit or reset lol.
My friend's company is switching from SVN to Git after decades and the one piece of advice I told them was the reflog will save you from almost anything!
@@HtotheG I use stash a lot as well, can't be bothered to commit wip stuff all the time lol
Great talk, are the commands listed somewhere for copy/pasting?
Hi, thanks for the session. FYI, you have a typo at 22:28
Namely `git maintainance` should be `git maintenance`.
4:02 ahhh man, the plumbing commands was what I was REALLY hoping to hear more about..
I often like to temp-merge a big selection of branches together, write that to a tree, then commit the tree with a massive bunch of parents, of where I merged from.. Give myself a giant octopus merge and then throw away all the temp-merging commits, so you have a nice clean "MERGE ALL THE FEATURES AT ONCE" commit.. Looks fantastic :D
Merge does do octupus with porcelain, not sure what you mean
thanks for saving me uncountable hours!
love it
Remember when version control used to be simple?
When it didn't need to be wrapped in huge frameworks so that people could work with it?
When it didn't need conferences like this?
When it wasn't the main topic of conversation on a project, and we just did the project?
Yes I do. And source control back then wasn't a tool the way git is. Like, also,git is awful in many ways, but I still love it deeply for the things it lets me do, manipulate and interrogate my repo history in many useful ways. It lets me approach certain problem classes in a meta way that old source control just could not. Branching is a first class citizen in git and that was not the case inb4. Learning git is a brick wall, as an early adopter I had the difficulty of explaining git many times to many companies, simple things are often stupid, and git basically requires you to learn it's mental model pretty well before you can do basic things with confidence. Then again, idk, sql doesn't make much sense unless you know what a relational database is. So git is hard in dumb ways, and if anything ever replaces it the way git ate svn, then I can't wait to drop git over whatever that future better system is, but it doesn't seem to exist, so I'm on the whole far far happier with git, warts and all, then any prior system. CVS wasn't even atomic, and vss would corrupt itself, svn really couldn't do branches and merge conflicts ruined your working copy in unrecoverable ways, and git is so so fast, and also best case was you could do exactly one local commit effectively where git you can do infinity local commits and also peer to peer stuff. Evolution of source control systems has been a net positive
@@rebeccakeller4666 Hi Rebecca. I could write a similar passage about how bad it is, but I won't bother. I will just say one thing; it is too difficult, and any good software should be easy. Yes, it can be learned, and when you have learned it, it is ok. But it shouldn't take so long to learn. I have been using Git for the last 10 years, so I feel like know it fairly in depth, but it took me about two years to get to this level. Why? You can of course take the easy way out at this point and just say I must be stupid, but I will assume you won't do that. It took me just a few weeks to get to a similar level with CVS, SVN, Clearcase etc. Now I know Git, but I have to work on projects with more junior people who are currently going through the same hell I went through. While they are learning, they make a lot of mistakes and people have to spend their time trying to fix them. The old systems, which would have improved a lot by now, were much better because they were simple and just worked. Anyway, I am glad you like it. Each to their own.
Most important command I learned *git blame*
At 43:04 you said you'd like to be able to work on more than one branch at a time. What are your thoughts on git worktrees?
they're fine, but they're not together. "at the same time" meaning with both branches applied to the same directory. like being merged but still being able to work on them independently. this is what we do with GitButler with virtual branches.
Fantastic
Gold.
Squash and merge ✊🏾
_This is the way_
Is it a way to get some old commit message being used as template? For example, if rerere has found the same resolution, could it also suggest the same commit message as before?
Wicked fkin opening soundtrack, bombaclaat!
Which zsh (or terminal) theme is that? I loved it.
do you guys use same github id for personal and work stuff? or use two separate ids created using separate email?
which one should i prefer, why?
Am I crazy or the Thumbnail is a terminator holding a futuristic gun? 😄
rebase + linear!
Nice Sneaker's reference
WHAT? this was in my home town and I had no idea 😢