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.

"fucking nerds...". Golden

Suggestion: add chapters (timestamps) to this video. It really helps when you're watching for the second time!

The excitement level of this guy is priceless. Imagine working with him in a team!

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!-

Great talk, I really appreciate the "shotgun" style presentation - it cuts the crap while keeping it clear.

Excellent talk! After many years on UKposts this made me create a new playlist of videos I need to rewatch regularly. The bar has been set pretty high!

The talk is great, but the manner of it being presented is even better!

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.

"Raise your hand if you never used anything other than Git" ... BRB feeling old.

`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.

Next to being an informative talk, the way it's presented is great. Good job on that presentation skills!

Fantastic presentation!

looking forward to gitbutler. awesome talk!!

What a great talk. Thanks :)

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!

10:59 that -L to blame and log is awesome!

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!

Time 8:13 - Setting or defining work and oss (open source software) directories. Thank you, Scott!

Didn't know that guy before, immediately caught fire because of his excitement, bought his book after the first 10 minutes. Great talk!

Wow. What a great presentation. Thank you very much.

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.

Wow, what a great talk! I'll add it to my collection of Git learning materials!

That was fantastic!!

Neat. Learned a few things. Thanks.

just pluggin git butler shortly, well done! Real-world git goodies, love it.

Great video thanks 🎉😊

I was supposed to go to Fosdem, but family business took priority. Thanks for uploading!

I was there, great talk! Made me discover GirButler, super promising!!

Found this fun and informative... love the Sneakers reference too.

Great talk! So many new gems to add to my workflow

Awesome talk!

If anyone has any questions or suggestions for the next version of this talk, we would love to hear them!

Waht a great talk. I have same frustrating about that part of git does not record all the shit for me.

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

I didn't know about range diff. I do the same thing manually because I didn't realise there was a tool for that :)

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.

I enjoy this talk. Thank you.

Youre a great speaker!

That intro music is an absolute banger.

Fantastic!

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 :)

Appreciated the Sneakers reference.

really an amazing speech. thanks

Whoah that virtual branch stuff is exactly what I was looking for I expected you needed something like Pijul for that

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 UKposts comment interface cannot display that string correctly.)

"my voice is my passport, verify me" -- I love the reference! :D

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.

Great session

Fantastic talk!

13:01 WOW! That's the way to use blame!

Awesome talk! But I was looking forward to hear about "git worktree" too.

You are hilarious!!!!!! In the positive way !!!!

Awesome intro 👏

What a fun talk!

thank youuuuuu I just instantly subscribed

Excellent!

🎯 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.

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?

Nice talk, thanks

banger talk

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.

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.

Great. video

ooh git butler looks dope

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.

Great video

the GUI vs CLI debate, I never think about that anymore since I started using Magit.

only thing I know for sure that was added recently was more a change, the default from 'master' to 'main' (about time!)

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.

thanks!

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.

thanks for saving me uncountable hours!

Most important command I learned *git blame*

Very nice talk, I like his energy on the topic we all use all day! Is there any source for the intro song?

Great lecture. Could you please share what command you used at 7:50 as bb alias to print this nice version of the branches

Fantastic

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

Wicked fkin opening soundtrack, bombaclaat!

Gold.

love it

I love the interactive add mention - seriously one of the three things I use `tig` for.

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?

I do a lot of code review and have been saved by reflog more than I care to admit 😅

Nice Sneaker's reference

1:30 CVS, SVN, Hg, Git, PlasticSCM

cool video)

WHAT? this was in my home town and I had no idea 😢

I don't think I know Git. I just have enough knowledge to use it at a level that fulfills my needs

Great talk, are the commands listed somewhere for copy/pasting?

Never thought, that there were tools properly managing deconfliction, while everyone is telling about His obvious insight.

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?

Hi, thanks for the session. FYI, you have a typo at 22:28

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?

Squash and merge ✊🏾

Am I crazy or the Thumbnail is a terminator holding a futuristic gun? 😄

14:35 On --word-diff - Sometimes it is useful to combine it with --word-diff-regex=. if you don't care about space separation as well