autorebase VS GitUp

> It should be possible to sync all of my branches (or some subset) via merge or rebase, in a single operation.

Not sure if this is exactly what the author is looking for but I made Autorebase exactly for this.

https://github.com/Timmmm/autorebase

Great article btw. A lot of those things are way harder than they should be.

That sounds great! I have partly solved this issue in my autorebase tool (https://github.com/Timmmm/autorebase) - it basically rebases every branch, and fixes the commit time so that stacked branches get preserved even after a rebase just because the hashes all match properly.

That obviously doesn't work if you modify or drop any of the commits, so this option is very welcome!

I have a tool that will automatically pull master and rebase all of your branches onto it, or as far as it can without conflicts.

I use a similar workflow and also got fed up with constantly rebasing branches so I made Autorebase to do it for me. It works really well and there were a surprising number of edge cases to handle, e.g. what happens when you run it from another worktree? What happens if the branch you want to rebase is checked out in another worktree? Etc.

FWIW, the per line staging functionality in GitUp (https://gitup.co/) is quite easy and straightforward. Very lightweight program that you can open via cli (`gitup` when in a git directory)

Not quite true, though while I was there, many fellow employees misunderstood the rules to mean that you couldn't use GPL software on your machine. At least as of a few years ago, the official ruling was that any open-source software _required_ for you to do your job had to be approved by an internal council of sorts, and GPL and AGPL software was right out. You could, however, use any open-source software you wanted (including GPL and AGPL) so long as it was (1) for personal use, (2) not absolutely mandatory for you to do your job (e.g. some niche software or library propping up your employment), and (3) there was some other alternative tool that you could use if necessary.

So, for instance, a GPL-licensed git client like GitUp[1] was fine to use, and didn't require clearance. You could totally also install a newer version of Nano if you wanted, too.

But, the rules _were_ somewhat vague and scary-sounding, so many engineers I worked with took the rules to mean "absolutely no GPL software under any circumstances".

What email is actually talking about is the option to bundle Nano _with the OS_, which Apple can't do with GPLv3 software. That's why for years, macOS has had an absolutely ancient version of bash (before the license was updated to GPLv3), and switched to zsh in newer versions of the OS.

[1]: https://github.com/git-up/GitUp

Gitup \Mac only]) and the command line at the same time. There are some esoteric commands I can’t remember so it’s nice having a GUI to do it and it’s nice having visual feedback incase of a screwup.

I only use it to keep track of certain projects. Gitup (Mac only) is another GUI client I use for visualizing progress and undoing mistakes.

A git client: Fork (paid), GitFox (paid), or Tower (subscription) for git version control. Which one you use is personal preference / price sensitivity. It's Ford vs Chevy. GitUp is free but a little weirder UI, though very powerful.

I typically use the CLI, but GitUp is the best git visualization tool I've ever found (although it's mac-only).

I Ctrl+F'd for GitUp based on the title, it deserves mention here.

It's all-in on Mac, unfortunately.

https://github.com/git-up/GitUp

> GitUp is built as a thin layer on top of a [Mac-only] reusable generic Git toolkit called "GitUpKit"

I thought Windows Sandbox would be more useful but over time I just haven't fired it up... I kind of forgot about it. I do use Hyper-V.

Every Windows user should run WizTree on their personal machines at least once a year to get a lightning fast report on disk space usage. Cleanup should start wih the largest items or you're just wasting your time! https://news.ycombinator.com/item?id=33893815#33894842

Bitvise SSH Server is also now free for personal use. I've been using it for over a decade since it offered simple multifactor authentication before OpenSSH (IIRC) and can block most bots by client identifier (libssh) -- security through obscurity works spectacularly here because OpenSSH does not yet support this. Their free-as-in-beer SSH client is a great GUI for port forwarding, SFTP, etc. but I dislike the built-in terminal's clipboard handling.

A Mac-only recommendation: https://gitup.co a GPL3 Git client with a unique UI and undo. https://news.ycombinator.com/item?id=27579701&p=2#27580659

If you use Pandora, check out the pianobar cli. For Twitch, there is Chatty (+streamlink cli & VLC).

I set up signald with a Google Voice number but haven't continued down the path of automating Signal.

I tried Tailscale (2021?) but it seemed a bit early, couldn't log out yet. So I went with ZerotTier. https://news.ycombinator.com/item?id=30284754

The tool used to visualize Git Tree: GitUp (looking for something better)