Hacker News Board Hacker News, browsed like a classic message board
Live data from Hacker News

The lazy Git UI you didn't know you need

bwplotka.dev

Post reply on HN
Print view View original

201–210 of 224 posts

Re: The lazy Git UI you didn't know you need

#201

Post by brianpan »

Jianghong94 wrote: post #176

Wait, no one mentions the default JetBrains IDE git UI? I mean, I get it if you're working from another IDE/text editor that doesn't have good git UI support out of the box, but JB's git UI is reasonably good enough that I don't want anything else. Things that I use (and I like): 1. quick checkout to another branch and automatically stash and unstash your local changes; when I just need to inspect code elsewhere I fi…

The diffs are the biggest reason I use it (beside the 3-way diff, I can't live without: blame, optimize imports, all the editor functions inside the diff, diff files/commits/branches).

Beyond that: separating into change lists (staging changes by line inside a file) and the graphical presentation and filtering of the commit history (highlighting what commits are in/out of your branch, show the git history of a section or line of code, show repo files at a commit)

Re: The lazy Git UI you didn't know you need

#202

Post by nice_byte »

mbork_pl wrote: post #139
nice_byte wrote: post #39

Earlier quoted context omitted.

> The benefit of keyboard-driven programs like Vim is that you're trading an initial learning curve for a vastly more efficient experience once the learning is done+. This is simply not true and I say this as a life long vim user. The only reason I have vim mode enabled in all the editors that support it, is the fact that it's immensely difficult to retrain muscle memory accumulated from a decade+ time sunk in that e…

> Or, I could use some actually well designed software and save myself some printer ink :-) Or, you could use some well-designed and self-documenting software. Too bad there's not much of that besides Emacs - on the other hand, Emacs and occasionally a browser cover most of my computering needs...

Good joke

Re: The lazy Git UI you didn't know you need

#203

Post by throw14082020 »

witcher wrote: post #146
opello wrote: post #127

> This site was paused as it reached its usage limits. https://web.archive.org/web/20251111071832/https://www.bwplo...

Should be now fixed, 6k views was too much for a free tier! Thanks for archive link

You should try cloudflare. 6k views is nothing on the free tier. Shocking to see your website taken down for 6k views

Btw it's down again

Re: The lazy Git UI you didn't know you need

#204

Post by plonq »

Jianghong94 wrote: post #176

Wait, no one mentions the default JetBrains IDE git UI? I mean, I get it if you're working from another IDE/text editor that doesn't have good git UI support out of the box, but JB's git UI is reasonably good enough that I don't want anything else. Things that I use (and I like): 1. quick checkout to another branch and automatically stash and unstash your local changes; when I just need to inspect code elsewhere I fi…

100%. One big benefit of IDE integration is that it’s the same editor. Same keybindings, same syntax highlighting, etc.

Re: The lazy Git UI you didn't know you need

#205

Post by johnisgood »

mariusor wrote: post #167
johnisgood wrote: post #142

Earlier quoted context omitted.

For that, I use git-cola... for some reason. Even though I live in the terminal.

Oh, I didn't know it. It looks pretty useful, but it requires more mouse usage than I'd like and its window is not very well suited for tiled window managers straight out of the box.

Yeah I have a rule in my i3 config so it gets focused and fullscreen. It does require mouse usage, which is why I wonder why I like it over say, lazygit. I may switch, but yeah, thought one should know of its existence, it is a cool piece of software, too.

Re: The lazy Git UI you didn't know you need

#206

Post by duskdozer »

moron4hire wrote: post #173
duskdozer wrote: post #125

Earlier quoted context omitted.

If you could make it opinionated in one or two ways, how would you do it? I'm having a hard time thinking about situations that would be solved by this

Actually, the more I think about it, the more I realize the problem is that Git is too opinionated about a bad idea: attempting to make a DAG feel like a linked list in order to make it "easier" to use from the CLI because CLIs make it way too hard to visualize DAGs (don't come at me with your CLI DAG viz. Even the best ones are strictly inferior to the simplest GUI DAG viz). There are really only two things I care a…

I definitely agree that some people are too fixated on "not changing history". I've never mentally had any problem with this and do it all the time because I think it makes things much clearer and easier. If you're restricted from ever amending or rebasing, I understand why you hate it.

I'm having a hard time understanding the issues you're having with reset and the workflow. It sounds to me like you just need to do something like "commit 'WIP A'/'WIP B'/'WIP C'" and fixup them as desired. Things like https://github.com/sjurba/rebase-editor make it a lot faster to do this. It wouldn't be too hard to make a small script/alias to do something like "modify commit A with , stashing the rest, rebase B->C on top of A, unstash", and assuming they aren't touching the same lines significantly, it wouldn't conflict much. But this could be way oversimplifying what you want.

Re: The lazy Git UI you didn't know you need

#207

Post by witcher »

prmph wrote: post #7

You might laugh, but in years of serious development, I have not come across a better git UI tool than SourceTree. If I want to be hard-core, I'd use the original git CLI. SourceTree is unmatched in how it makes using git so much more pleasant for when you need to do something relatively simple, but which would be quite cumbersome to do with the CLI and most other tools I've tried. Its file status and history view is…

(author of the blog post here)

I think there's a learning around stability of devtools here. It takes time to get used to things, but once you do you are ultra productive. That's why IDE Git UIs are not ideal, because the graphics change so often, confusing you more than helping etc.

I got stuck to git gui / gitk for so long for this reason, I couldn't parse other UIs e.g. for diffs until I forced myself to have a less productive time to learn new UI.

I hope lazygit is stable - I think I might need to construct some stable config for visuals / colors to ensure this! (:

Re: The lazy Git UI you didn't know you need

#208

Post by witcher »

throw14082020 wrote: post #203
witcher wrote: post #146

Earlier quoted context omitted.

Should be now fixed, 6k views was too much for a free tier! Thanks for archive link

You should try cloudflare. 6k views is nothing on the free tier. Shocking to see your website taken down for 6k views Btw it's down again

Makes sense, thanks!

Re: The lazy Git UI you didn't know you need

#209

Post by witcher »

Jianghong94 wrote: post #176

Wait, no one mentions the default JetBrains IDE git UI? I mean, I get it if you're working from another IDE/text editor that doesn't have good git UI support out of the box, but JB's git UI is reasonably good enough that I don't want anything else. Things that I use (and I like): 1. quick checkout to another branch and automatically stash and unstash your local changes; when I just need to inspect code elsewhere I fi…

(author of the blog here)

That's a great point. I should have mention the IDE Git UIs, def a nice option and sounds like the JB one works well for you!

I do use it heavily for "annotating git blame"!

I've never consider using JB Git UI fully mainly because of the point made earlier, so stability (https://news.ycombinator.com/item?id=45898089). Once you learn, especially visually, you don't want cosmetic changes. IDEs change yearly to stay "consistent".

Another point is portability. E.g. I didn't want to pay for personal use of JB (so rare case), so I have to use different IDE. Separate tools (especially free and OSS) is a big advantage. Not mentioning ability to use it on remote shells or different machines!

lazy git offers 1, but 2 and 3 points are interesting. Wonder if there's an easy way to compare commits and filter commits by user and folder in lazygit. (:

EDIT: Actually, I also use JB for conflict resolutions ;P so not entirely 100% lazygit flow.

Re: The lazy Git UI you didn't know you need

#210

Post by witcher »

jmkmay wrote: post #45

Something not mentioned in the article which has changed the way I interact with git repos (and the reason I will never not use LazyVim until something better comes along) is just how well the system plays with tmux floating panes. I have it so that anytime I press ctrl-g in a git repo, I open a floating tmux pane in my current working directory. This might sound "whatever", but it means I don't have to actually be i…

(author of the blog post here)

Oh yes, I use lazygit as a separate binary (brew installed) from separate terminal shell all the time. No need for nvim!

Great to hear you can neatly configure similar UX (popup) with tmux!

Post reply on HN