GitUp VS Git

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)

Boy, I can't find this either (but also, the kernel mailing list is _really_ difficult to search). I really remember Linus saying something like "it's not a real SCM, but maybe someone could build one on top of it someday" or something like that, but I cannot figure out how to find that.

You _can_ see, though, that in his first README, he refers to what he's building as not a "real SCM":

https://github.com/git/git/commit/e83c5163316f89bfbde7d9ab23...

Here is the direct link, as HN somehow removes the query string: https://github.com/git/git/commits?author=peff&since=2023-10...

I understand all that.

I'm saying, if you write a survey and one of the possible answers is "diff", but you don't clearly define what you mean by "diff", then don't be surprised if respondents use any reasonable definition that makes sense to them. Ask an ambiguous question, get a mishmash of answers.

The thing that Git uses for packfiles is called a "delta" by Git, but it's also reasonable to call it a "diff". After all, Git's delta algorithm is "greatly inspired by parts of LibXDiff from Davide Libenzi"[1]. Not LibXDelta but LibXDiff.

Yes, how Git stores blobs (using deltas) is orthogonal to how Git uses blobs. But while that orthogonality is useful for reasoning about Git, it's not wrong to think of a commit as the totality of what Git does, including that optimization. (Some people, when learning Git, stumble over the way it's described as storing full copies, think it's wasteful. For them to wrap their heads around Git, they have to understand that the optimization exists. Which makes sense because Git probably wouldn't be practical if it lacked that optimization.)

The reason I'm bringing all this up is, if you're trying to explain Git, which is what the original article is about, then it's very important to keep in mind that someone who is learning Git needs to know what you mean when you say "diff". Most people who already know Git would tend to gravitate toward the definition of "diff" that you're assuming (the thing that Git computes on the fly and never stores), but people who already know Git aren't the target audience when you're teaching Git.

---

[1] https://github.com/git/git/blob/master/diff-delta.c

Didn't Git have a new default merge strategy, `ort` https://github.com/git/git/blob/master/Documentation/RelNote... ?

Yes, but you are referring to standalone scripts, not functions defined within a Bash script.

Compare for example the following helper code used for git command completion inside Bash and inside PowerShell.

Bash: https://github.com/git/git/blob/master/contrib/completion/gi...