this post was submitted on 24 Sep 2023
131 points (94.0% liked)

Programming

17509 readers
10 users here now

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Rules

  • Follow the programming.dev instance rules
  • Keep content related to programming in some way
  • If you're posting long videos try to add in some form of tldr for those who don't want to watch videos

Wormhole

Follow the wormhole through a path of communities [email protected]



founded 1 year ago
MODERATORS
top 25 comments
sorted by: hot top controversial new old
[–] wyrmroot 27 points 1 year ago (1 children)

So, only about a decade until reaching feature parity with something like lazygit?

[–] [email protected] 12 points 1 year ago (2 children)

lazygit is seriously so good, it’s a shame so many people write it off because it’s not some beautiful Apple GUI. it’s an extremely efficient productivity tool.

[–] [email protected] 9 points 1 year ago* (last edited 1 year ago)

I don't write it off because its ugly, I like snappy TUI tools. I write it off cause its not easy to pick up compared to what's already in my editor.

I don't

  • stage individual lines (which is just a keystroke in my editor)
  • interactive rebase
  • cherry pick
  • bisect
  • nuke working trees
  • amend old commits

I use git a lot, and I've learned/done each of those tasks, but I don't ever find myself needing them.

[–] [email protected] 5 points 1 year ago
[–] [email protected] 22 points 1 year ago (1 children)
[–] TheCommieAxolotl 2 points 1 year ago
[–] [email protected] 11 points 1 year ago (5 children)

Bookmarking this. I have such high hopes for this! I recently went searching for my new git GUI, looking for something free, cross-platform, and simple. Basically what I found is the only one I like is GitKraken, which is not free (I have private projects, which GitKraken paywalls).

If this ends up anything like how these screenshots look, this will be my new client! Do you have a Patreon or other donation mechanism?

[–] [email protected] 9 points 1 year ago (3 children)

Vscode and git lens. If you are older like me, emacs and magit

[–] [email protected] 2 points 1 year ago (1 children)

Unfortunately, GitLens is by GitKraken. Seems like they might not restrict it for private repos, though, I'll check it out.

[–] [email protected] 3 points 1 year ago

They dont restrict it, I use it with private repos all the time

[–] [email protected] 2 points 1 year ago* (last edited 1 year ago) (1 children)

Isn't there a magit-alike plugin for vscode? I have found it so frustrating working with devs who don't use magit, because most seem to find slightly more advanced git like squash and fixup and cherry picking to be impossibly hard.

[–] [email protected] 1 points 1 year ago* (last edited 1 year ago) (1 children)

For these reasons, I always push for simple and straightforward workflows and many commits and merges. For many people git remains a mistery also after years working on it. I blame the easy-to-use guis, many people learn 2 buttons to press for a workflow, and they never care learning more

[–] [email protected] 2 points 1 year ago* (last edited 1 year ago) (1 children)

I blame the easy-to-use guis

All the people I've worked with seem to use the command line. They just don't know much beyond "commit everything" and basic push/pull/branch/merge.

Conversely I learned most of what they don't know direct from the magit GUI. So I often don't know the specific command arguments. Not a good thing, but only a problem for communicating what to do to others.

[–] [email protected] 1 points 1 year ago

Magit is super cool but not exactly easy to use :D

[–] [email protected] 1 points 1 year ago

This^ plus ungit (especially when things go really bad; e.g. force pull/push) seems to be the current ideal git workflow.

Hopefully this project will change that though!

[–] syl 3 points 1 year ago (1 children)

There is Fork. But sadly, it is not available for Linux. Git-fork.com

[–] [email protected] 2 points 1 year ago (1 children)

Fork is only "free" in that the evaluation period is indefinite. This is generous and clicking through the nag isn't a huge deal, but I develop on both Linux and Windows and I need a client that supports both.

[–] syl 2 points 1 year ago (1 children)

Ah, sorry. I didn't see that you require it to be free. It is also not open source IIRC.

[–] [email protected] 1 points 1 year ago (1 children)

Open source is a definite plus, but tbh not a requirement for me. Actively maintained, free, Windows and Linux, and simple. Oh, and it has to have a dark theme 😄

[–] cschreib 2 points 1 year ago

GitHub Desktop works well for me and my workflow; even though the Linux version is only supported by the community (possible thanks to it being open source). The UI is very neat and simple. Yet you can do squash, reorder commits, ammend, commit hunks etc. Dark theme available of course! It integrates with GitHub (for PRs mostly) but afaik isn't tied to GitHub repos.

[–] TheCommieAxolotl 2 points 1 year ago

Thank you so much!

I have a GitHub sponsors page (unsure if i can link it here) under this same name.

[–] [email protected] 1 points 1 year ago (1 children)

@TwinHaelix @TheCommieAxolotl

I also loved git kraken but due to the pay walls and stuff, I switched to GitAhead and found it to be similar enough and have been using it for things/projects when I find lazygit to be inadequate.

[–] [email protected] 1 points 1 year ago* (last edited 1 year ago)

You maybe know this but GitAhead was discontinued, and the maintained fork is called Gittyup: https://github.com/Murmele/Gittyup

[–] beefsquatch 1 points 1 year ago

Sublime merge has been really good. It's a free trial like sublime text

[–] [email protected] 3 points 1 year ago

BTW, website "link to source code" is broken.