You Don’t Know Git - Edward Thomson - NDC London 2025
HTML-код
- Опубликовано: 13 апр 2025
- This talk was recorded at NDC London in London, England. #ndclondon #ndcconferences #developer #softwaredeveloper
Attend the next NDC conference near you:
ndcconferences...
ndclondon.com/
Subscribe to our RUclips channel and learn every day:
/ @NDC
Follow our Social Media!
/ ndcconferences
/ ndc_conferences
/ ndc_conferences
#git
You use git every day; every developer does. It’s been the most popular version control system for more than a decade. Some people use just the basics of the tool: fetch, add, commit, push. But there’s more - much more - to the tool. Even if you’re familiar with advanced features like rebase, there’s a host of hidden git features and functionality. Edward unpacks some of the lesser known functionality in git and introduces some things you don’t know about, so that you can be even more productive with the tool that you use daily.
6:03 .gitconfig
19:33 git grep
25:19 git reflog
29:33 git recover
34:44 git diff -word-diff
37:31 git blame
42:48 merging files
45:00 merging files: conflict
51:45 merge tools
52:05 rerere
56:00 .gitignore
57:22 conditional includes
59:15 line ending filtering
"Goal: make git fun, easy and productive". Edward is the most optimistic guy I've ever seen.
great talk, learned more than just one thing! (git grep, git recover)
The rerere saved my day
Most of us learn 50-60% and don't go beyond! Learned a few things here! Thank you!
Using Windows Terminal instead of the default Windows Console or MinTTY is probably the way to go these days. UPDATE: Can confirm, the full supported range of colours is available to git (so... all of them). Checked on Windows Terminal 1.22.10731.0 on Win 11 24H2 build 26100.
Now, I believe I an owed a pint. Was hoping for fsck and filter-branch's more obscure features, or a rant about submodules (which I loathe with a passion).
Full disclosure: I've used git on a daily basis for about 20 years, and worked on a fair few git related tools/projects (like gitk and vim plugins), and have used libgit2 for a couple of them, so I'm probably not the target audience. Thanks for maintaining the library, really saved me a lot of time over the years
Huge miss to not title this "Git good"
Great stuff as usual!
Great content but horrific camera work. Ever heard of zooming out??
You don't know me. (I always enjoy those provocative titles because it makes filtering out videos so much easier)
Really cool talk! :3
Great talk! There is a 44:19 small mistake, their branch also changed the line 2 from the common ancestor which happens to be the same change in our branch.
This is an excellent talk and we featured it in the latest issue of 💥Tech Talks Weekly.
Congrats!
That's a roller coaster ride on git ... 🤓
Does anybody know where the slides are?
Makes me crazy that he messes this up. CGA was four colors -- white cyan pink and black. EGA was 16 colors.
what did you expect from someone who thinks he is the only one in the room who can read git manual
CGA was four colors in _graphics mode_. It had 16 foreground colors, and 8 background colors in text mode.
He didn't notice that the method call in that diff was git_http_parser_execute in his changes and just http_parser_execute in the common and their versions?
Very bold of you to say that
Just define alias like git grepp etc for the -P
Very slow getting to the point
I wonder if camera is moving on it's own or if there's guy moving it or there was big resolution recording and this is postprocessing magic.
anyway great talk!
Seems like a human moving but this day and age, who knows
probably automatic
At work we have tracking cameras in our meeting rooms. I can imagine that a conference like NDC also has such cameras.
I think it's software. It seems a little too jerky for a (professional) human operator -- it's actually giving my ancient arse motion sickness 😅
We need a filter on videos to remove all the breathing and swallowing sounds.
we need to filter out rtfm kind of videos.
And the first 6 minutes, which are just padding.
Lung noise, throat air noise, glottal stop noise, nose snort noise, inbreathing noise, hissing noise, tongue juice noise, yes, filter them out. Anyone wearing earbuds or headphones can hear all those noises coming through clearly. The noises go straight to your eardrum.
we don't know you that's for sure. i'm not a big fan of speeches claiming "you don't know X" and then just rtfm for me. are you sure you're the only one in the room who can read?
if you know all these commands and configurations that’s good for you. not everyone does though
@@kosidinna_ well, all i can say RTFM. speeches like that feel disrespectful to attending people. i do like "hidden gems" kind of lectures or advanced usage tips and tricks but this one felt simply offensive. like he was talking to a bunch of idiots who have no clue how to use git.
I gave several git workshops for general public and for my colleages. I won‘t ever do that again, since I found jj (jujutsu).
But people look at annotate to blame
mercurial is better, it lets you work on many paralel local branches which stupid git cant do without rewriting each other
Have you ever read about git worktress? It's basically what you described
@@zejwier5442 no i didnt heard that. nobody uses this and its not a standard tool. standard tool is stupid stash and unstash, to preserve one uncommited branch change when you load another into workarea.
git is crap as so many things you discover in life that are crap and that there are much better solutions but people just dont care.
You need Visual Studio Code 😅
Why? He just needs a better vim config. I've tried VSCode, spent a fair chunk of time setting it up, too, but never matched the productivity I get when using Vim.
mouse-driven software development activist detected :)))
🥱
This title is just silly.. we all know how to do this stuff?
not everyone does though. it’s okay if you do
@@kosidinna_ it isn't ok to not know basic git. the guy suggested he is the only one in the room who knows basics of git.
Huge miss to not title this "Git good"
@@kosidinna_ Fair enough - then don't call the talk "You don't know git"
Call it something less obnoxious, like "git tips for beginners".
Wow, that really was not worth my time. Thanks for nothing.
Thanks. Saved me the trouble of watching it. Five minutes in I was waiting for it to start.
you really don’t have to comment. some people found it useful
Annoying and arrogant title for a presentation. Lame.
I only opened the video to leave this comment; Not interested in what the guy has to say.
okay. cheers mate. you didn’t have to leave this comment but i’m happy for you
Stop saying um
um no
@@dasten123 Don't present if you can't speak coherently without filler words. Basic stuff.
@ uhm ok
14:46: You lost me at Mac or Windows machine...
Boring talk.
'p' stands for 'print': g/RE/p
No, I don’t. And I don’t have the time or inclination to learn the complex ins and outs and the insane complexity.
The help is just ludicrous. It’s reams of meaningless guff.
I write code. I want a simple tool to take care of the code.