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

81–90 of 224 posts

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

#81

Post by wingerlang »

weeb wrote: post #68
wingerlang wrote: post #52

Earlier quoted context omitted.

I’ve used SourceTree for a decade, Fork is the only one I’ve switched to partially (at work). I probably will switch back to ST even at work because I dislike: - I want the split view of ST where I can simply see the changes and not lose the commit log. - “see only current branch” is super useful in ST to see only the current branch’s commit log. (Partially writing this in hopes of someone pointing out ways to do thi…

You can do "see only current branch" with the little filter icon when you hover next to a branch. Although I do find myself getting lost amongst branches more easily compared to Sourcetree, I think there's some difference in how filters are combined that isn't ideal (but I can't remember specifics)

Thank you!

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

#82

Post by tcoff91 »

danielhep wrote: post #43
Zambyte wrote: post #6

The less I use git directly, the more convinced I am that git is an absolutely awful interface to git repositories. I have been using jj for about two years now, and I literally cannot imagine going back to using the git cli. I have not used lazygit, but if you find it interesting, I say please go for it. The please is because I am tired of fixing issues created by people being confused by git. Just use anything else…

I have tried jj several times but I feel like it slows me down significantly because I can’t grok the workflow. I like to do a bunch of changes then quickly select them in my editor and commit them, breaking them up into different commits to keep them organized. With jj’s lack of editor integration, I don’t know how to do this with the cli alone so I end up with bigger messier commits.

In JJ you make a bunch of changes and then you split the commit into multiple commits.

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

#83

Post by stouset »

danielhep wrote: post #43
Zambyte wrote: post #6

The less I use git directly, the more convinced I am that git is an absolutely awful interface to git repositories. I have been using jj for about two years now, and I literally cannot imagine going back to using the git cli. I have not used lazygit, but if you find it interesting, I say please go for it. The please is because I am tired of fixing issues created by people being confused by git. Just use anything else…

I have tried jj several times but I feel like it slows me down significantly because I can’t grok the workflow. I like to do a bunch of changes then quickly select them in my editor and commit them, breaking them up into different commits to keep them organized. With jj’s lack of editor integration, I don’t know how to do this with the cli alone so I end up with bigger messier commits.

This exact thing is quite literally one of jj’s flagship features: `jj split`.

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

#84

Post by ramraj07 »

promiseofbeans wrote: post #72

People often avoid it because of the name, but Github desktop is pretty amazing. It works great with all git repos (including ones not on Github), and makes it super easy to amend commits and cherry-pick files/lines to include. Everything has handy names, and all the complex operations have text explaining what they do. GH Desktop's merging, conflict stuff, and (lack of) graph leave much to be desired, but it's alrea…

Seconding GHD. They have added features very slowly, very thoughtfully; HN tends towards experts (or at least people who think they are). I am aware that I'm NOT good with git. I will never do anything that has "hard" or "rebase" in it without spending 20 minutes making sure its what I want to do. Unfortunately I have seen way too many semi junior engineers who think they're git lords who force push bad histories and ruin our git repo. I tend to suggest strongly that people should use github desktop if they are in my team though very few people take up that suggestion :)

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

#85

Post by tcoff91 »

imiric wrote: post #65

Am I the only one who simply doesn't mind Git's CLI? Sure, it's rough around the edges, but I know those edges well. I sometimes do need to look up how to do something, but those cases are rare. Over the years I've accumulated about a dozen shell aliases and a modest `.gitconfig`, and along with a couple of helper tools[1][2], I can do 90% of what I need Git for in seconds. I truly don't need a fancy TUI, GUI, or any…

There is a new VCS that is a step forward (while being compatible with git). It’s called jujutsu.

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

#86

Post by elias1233 »

The git integration in VS Code has gotten really good lately. It has the commit graph, with cherry picking, worktrees, stashes and a very nicely integrated merge editor and rebasing, along with all the common commands. Also staging individual sections and lines visually, which I use daily

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

#87

Post by abathologist »

Quekid5 wrote: post #71
skydhash wrote: post #14

Earlier quoted context omitted.

Did you try magit? There's a bit of learning curve as it's built on top of Emacs, but it's entirely keyboard driven. I still have to find a workflow that it does not support.

Magit[0] is so good that I haven't felt any real need to use jj... yet. I'm sure I'll switch if it gets emacs integration of a similar level to magit, but the one I tried[1] isn't quite there yet. [0] Well, plus git-mediate for solving conflicts [1] https://github.com/bolivier/jj-mode.el

Same. I have not been able to find an explanation of anything jj supports that I don't have already with magit, but I am open to learning :)

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

#88

Post by Quekid5 »

abathologist wrote: post #87
Quekid5 wrote: post #71

Earlier quoted context omitted.

Magit[0] is so good that I haven't felt any real need to use jj... yet. I'm sure I'll switch if it gets emacs integration of a similar level to magit, but the one I tried[1] isn't quite there yet. [0] Well, plus git-mediate for solving conflicts [1] https://github.com/bolivier/jj-mode.el

Same. I have not been able to find an explanation of anything jj supports that I don't have already with magit, but I am open to learning :)

I think the big thing (potentially, for me) is the ability to postpone conflict resolution during a rebase. That can be quite painful in regular old git, but git-mediate helps make that less painful in practice in my particular situation and workflow.

We'll see once better non-cli UX appears. I'm low-key excited for what could be possible in this space.

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

#89

Post by jayd16 »

promiseofbeans wrote: post #72

People often avoid it because of the name, but Github desktop is pretty amazing. It works great with all git repos (including ones not on Github), and makes it super easy to amend commits and cherry-pick files/lines to include. Everything has handy names, and all the complex operations have text explaining what they do. GH Desktop's merging, conflict stuff, and (lack of) graph leave much to be desired, but it's alrea…

> GH Desktop's merging, conflict stuff, and (lack of) graph leave much to be desired

I think that's more of the reason why people avoid it.

Post reply on HN