@b0rk The idea that git doesn't have to use the same mechanisms to identify difference.
E.g., for line based text use git rebase main but for XML documents (XSLT, XML, XSD,…) use git rebase -s subtree -Xours -Xignore-all-space main and your suffering is going to decrease.
@b0rk using gitui for a couple of months and simply love it. The simple fact that I can visualize the file changes and navigate through them makes my life easy.
@b0rk I saw this video on “Oxidise your life” the other day that has suggestions for a lot of great Rust-based modern CLI tools https://youtu.be/dFkGNe4oaKk
@b0rk Since you are using the expansive definition of "command line tool" that includes full-screen interactive textual user interface applications, I think magit should definitely be on the list. I hear there are people that use Emacs exclusively for magit!
@b0rk i have a handful of aliases i use all the time that i get confused about when i'm on another machine: amend=commit --amend; co=checkout; d=diff; ru=remote update; rv=remote -v; s=status; and of course the horrendous lg=log --graph --pretty=format:'%Cred%h%Creset %s %C(bold green)(%a
r)%Creset %C(blue)<%an>%Creset%C(bold yellow)%d%Creset' --abbrev-commit -
-date=relative --no-show-signature :)
@b0rk Yes lazygit is amazing (and you can embed delta inside it btw). I get confused using it for complicated rebases, find it easier to just do it the "real" way, but for simple everyday operations and editing, commit messages or reordering and squashing commits, it's great. It's kind of a GUI though depending on your definition.
It's how I learned about and started using some important git features, such as stashes. UIs like gitui are fantastic for discovery. It's just easier to tell what's going on in a repo by flipping thru gitui.
I also think it's fun to get an overview of a git repo with onefetch, but that's more for aesthetics and showing off: https://github.com/o2sh/onefetch
@b0rk useful git aliases? e.g. I have git please for git push --force-with-lease and git find X which is a git ls-files | grep X to quickly find files.
I use https://github.com/scmbreeze/scm_breeze to get a pretty status and short numbered aliases for changed files, branches, etc. It also has short aliases for commands (like ga for git add), which may be too much for some users.
@b0rk I wrote a bash shell script around git that can do the basics. It can add, commit, push, present emojis. It limits commit messages to under 50 characters. It can revert back your commit, help start a new project, and even create or delete github repos using their api if you use an access token.
It's not as good as lazygit and others, but I wrote it as a learning tool and actually use it everyday. It even has a simple install script and man pages.
@b0rk If you add that line to the [alias] section of your .gitconfig then from a cli git alias will list that and all your other .gitconfig aliases. Possibly I got it from https://stackoverflow.com/q/7066325/1124740 though ddg suggests lots of people have invented this.
@b0rk I have a combination of editor bindings/aliases that let me open either:
-the current file
-the current line
-the current selection
in GitHub, so I can send links to people.
I also have directory-based identity (including SSH/GPG!), and a git whoami alias.
If nobody's said it yet, storing GPG keys and ssh key passwords in the macos keychain (or similar); I don't need to type either of them ever.
Global gitignore files, a concept more people should be aware of (so that if a new person joins a project, they don't need to add all their editor files to the project's gitignore.) There is a decent but somewhat unmaintained collection of these on GitHub.
I also have a terrible (but very useful) pile of hacks to run git hooks on every repo, while still running local hooks, whether via husky, pre-commit, or .git/hooks. This way I can scan for secrets before committing, or add Jira tickets to the commit messages automatically.
Add comment