Sylvan Franklin

What do you use for git tooling? Some people still use git diffcheck of vscode or another IDE. That's some big brain SWE activities right there, but I'm curious if there are others who have found cli workflows that they like. My tip for you is to use a fuzzy picker to go over the commits of your current buffer. This is brilliant because you can go back in time, yank a chance, and then go back to the present. If your team is good all the commit messages should be a great trail of crumbs to find what you need to.

2 weeks ago | [YT] | 112



@sylvanfranklin

Also check out this channel: https://youtu.be/ijqrZt1b0iw?si=3GXma-MFIHrWMc1v

2 weeks ago | 2

@hiegz

git add git commit git push

2 weeks ago (edited) | 28

@jimgerth6854

I‘ll forever stay in the CLI for git, just need some short aliases for common commands and a nicely formatted log and I can do anything :)

2 weeks ago | 35

@55sombreroman

Magit stays winning

2 weeks ago | 8

@MaxJM711

Lazygit has been my bread and butter for some time now but Jujutsu has been proven to be a great VCS as well; definitely would recommend at least trying it out to anybody that has a bit of time to play around with it :)

2 weeks ago | 9

@banananar3801

LazyGit when I am not lazy and just casually remember commits directly to checkout to

2 weeks ago | 0

@deathstar107

I have recently been using Jujutsu VCS with the git backend and its pretty good.

2 weeks ago | 5

@Hellbending

I use jj cos I found the workflow easier. I kept forgetting to commit as I’d sort of comb through the code base and make changes that would sprawl several clumps of files and jj/jujutsu helps due to how it does splitting, squashing and rebasing. Very easy to completely change the branching structure and nice things around

2 weeks ago | 2

@Blacksheep2011

Lazygit with difftastic. That’s nice shit. Best git client I have ever used. No ai bloat ware just pure efficiency

2 weeks ago | 16

@_xytis_

I found Jujutsu through last episode of Developer Voices. Does that count as git interface?

2 weeks ago | 4

@Cammymoop

I just rebase commit push, but it's because I'm the only one working on the code right now. no need to waste brain real estate on it. It's just good to keep track of history and synchronize between machines even when I accidentally diverge, don't need anything more fancy atm

2 weeks ago | 3

@roverp3955

Git cli with fzf for recursive auto completion and diff in a preview window

2 weeks ago | 2

@thepi

vim fugitive because the simplicity of it is amazing.

2 weeks ago | 3

@nicholaswatching

Mostly using git fugitive to do daily git stuff (I find it faster than the default aliases to do <leader>gg to have a magit-like view of git) Exceptions to this are: - using Neogit (has diffview.nvim integration) to explore previous commits from other projects in some ways like github. (edit: this is bloat in that it's made to be a replacement to git fugitive... but I really like this one feature.. and I like git fugitive too much.) - i use my own script for git cloning so I can do something like `fgit paoloap/zaread` and it saves it in the right place and I'm cd'd into it automatically since that's usually what I do. - Git push and pull I do in the terminal / alias since I want to control clearing clipboard, passwords and stuff like that.

2 weeks ago (edited) | 2

@mateuszabramek7015

I'm mostly fine with just git executable and if project doesn't have complicated structure of branches or merging it's enough for me. But the most easy GUI tool for Git I used was Git Kraken - it's paid, though there's trial version - it's handy especially if you messed up and you want to remove something completely from branch history like let's say API key...

2 weeks ago | 1

@ivanheffner2587

Straight git cli. `git add -p` and pick the chucks I want; sometimes edit those before staging them. `git rebase -i` to tidy up my local branch before pushing. When I have a conflict, I might jump into a JetBrains product because it’s conflict resolution / 3-way diff tool is nice, but I can also just use vim with splits for (local | base | remote) / merged and get the resolution done by hand. Of course, I have rerere cache enabled. And I always fetch in one step and rebase onto upstream in a second step.

2 weeks ago | 1

@j1d7s

I use the Gitsigns plugin in Neovim, the gh GitHub CLI, regular git commands and lazygit in the terminal, the latter mostly when things get messy.

2 weeks ago | 0

@overlordofice

I really like vim-fugitive, it easy to configure a fast workflow for yourself in neovim, everything is buffers so it’s very easy to search, navigate, yank, etc. You also never have to leave neovim(why would you), and looks cool tbh

1 week ago | 0

@LiamWirth

I mostly just use the terminal, and then lazygit for everything else. I've also used git to track almost every university class I've taken where it's applicable or relatively easy to use Git and it's saved my ass multiple times

1 week ago | 0

@ThinkerOfThoughts

Follow your heart, twin.

2 weeks ago | 0