I'm never using Git the same way again

In this episode, we're reviewing a game-changer in how I work with Git every day. I've dropped the obvious GUI choices for Git and Github CLI — welcome to Lazygit. From the simple things like committing and pushing to the dreaded merge conflicts, Lazygit will keep you in that flow state. Lazygit is an unbelievable tool that I think everyone will love.

github links:

chapters:
00:00 Introduction
00:59 Why not Git CLI or a GUI
02:27 Installing Lazygit
03:37 Lazygit interface
04:30 Staging a File
05:51 Creating a new branch
06:28 Committing a file
06:55 Pushing a commit
07:15 Rebase
07:53 Resolve conflicts
10:37 Thanks Jesse!
10:59 Outro

[domojestic]

I remember asking about Git integration during your Neovim setup tutorial; so cool you've decided to opt for a dedicated CLI program! Can't wait to watch this later.

[therealslimaddy]

It’s an amazing tool, has surely enhanced my workflow.

My cli setup lately has been (Zellij + lazy nvim paired with lazygit & lazydocker as floating window)

[tobiasl.]

Really love that you print out the commands and shortcuts you are talking about !
Especially as a non native English speaker

[raphaeld]

This looks really nice, sort of like magit but as a standalone cli/tli instead.

9:40 Though, I'm pretty sure that when you `git push --force`, you would rather want to use `git push --force-with-lease`.
That will prevent overriding anything that you did not fetch before.
That will help a lot when someone else pushed to your branch since.

[HeySeeri]

Cool to see folks discovering UI's in 2024!

[sharperguy]

i used "git gui" for years which did something very similar but with a simple tk ui. Nice to have equally powerful TUI based options now.

[alcb]

I liked lazygit and I would use it if I didn’t know fugitive. Personally I find that having your git gui inside your editor makes you much faster, but hey thats just me

[ammarmerakli]

Love the content. If you combine it with git delta, you get a fancy diff like vs code

[ColinFox]

"I've been a developer for a long time. 12 years.". Jeez man - I've been a professional developer for 38 years. What does that make me? Prehistoric? :D

[TomSoraoka]

Totally agree that merge conflicts are the only thing I dislike doing from command line. It's difficult to visualize the conflict looking at +++, ---, >>>, and <<< symbols. I think Lazygit makes things a little easier, but still not as easy as a graphics tool. You still see the +, -, >, and < symbols. But the fact you can do this in a terminal window is amazing.

[dimitrisdrosos]

Great video. Will definitely use it in the future.

[fabianmallmann]

How did this channel become my favorite in just one weekend?!

[whaisonw]

I am currently learning vim motion to ultimately switch to vim. But for now I am jusing the intellij ides and the git tool really is best in class. No need to leave the editor and the merge conflict resolve tool is just the best. Good that you showed that tool. I'll definetly use something like that when switching

[VinitKhandagle]

you are one the best person that explains a topic!!!

[phaberest_]

It also integrates gitflow perfectly, it's a true beast! I found it as part of a neovim distro I installed (can't remember which but it ran in toggleterm) and fell in love with it

[tinotaylor]

I definitely think that this is where IDEs shine. I haven't felt comfortable using vim for git conflicts and this still looks like quite a lot of steps in comparison.

[misterkite]

I've been using Linux for 30 years now, and it's a bit funny how I'm still basically using the same classes of command line tools, it's just that they're seriously polished these days. Back in the day my programming environment was cvs/screen/bash/vim, today it's lazygit/tmux/fish/helix.

[climbing-this-wall]

Big fan of LazyGit - thanks for covering this

[GertCuykens]

Very well tutorial, thank you. My only small suggestion would be to rebase the other way around 'main' onto 'debuging-baby' in your tutorial just because its the more common rebase you encounter

[KeithGyarmati]

This is awesome! I typically use gitkraken if I get a really gnarly merge conflicts via the command line.