git-absorb
sublime_merge
git-absorb | sublime_merge | |
---|---|---|
22 | 27 | |
3,191 | 270 | |
- | 1.1% | |
7.5 | 0.0 | |
24 days ago | 8 months ago | |
Rust | ||
BSD 3-clause "New" or "Revised" License | - |
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
git-absorb
- Git Absorb
- Git-absorb: Git commit –fixup but automatic
-
OpenTF Repository is now Public
Nice, no need to look up past commits ! Didn't know about this, I had to look it up.
It's a separate project from git [0].
[0]: https://github.com/tummychow/git-absorb
-
Lazygit: Simple terminal UI for Git commands
Boy have I got the thing for you. git absorb - https://github.com/tummychow/git-absorb
The way to work with it is:
git add file1
- tummychow/git-absorb: git commit --fixup, but automatic
-
What do you use for git integration in neovim?
You can also manage via a holistic UI: - Bisection - Log and reflog, stashes - subtrees, submodules - certain third party subcommands like git-absorb, and extend it with your own - interact with issues and pull requests via forge - pretty much all of the hundreds of CLI flags via a modal UI that got generalized and extracted to a lib called transient - well-integrated diff and conflict resolution (which is mostly just smerge) - the rebase/cherry-pick workflows I liked the best, including support for --update-refs - at any time you can always press a key to see the raw commands and output that it's using, which taught me a ton of corner cases - IMO it has a great manual
-
Move File Changes From One Commit To Another
I sometimes use git-absorb to help me if I made a tonne of changes, and can't be arsed to manually make the fixups
-
Theodore Ts'o on how he uses Git when working on Linux (2017)
If done well, your git history carries the information of your process in a very similar way.
You have to be somewhere in the middle, so I'd say to do a semantic rebase at last step before merge. A fantastic tool that is not so well-known is git-absorb, which helps a lot doing that cleanly and automatically.
https://github.com/tummychow/git-absorb
-
Intern fixes 600 bugs but makes only 1 PR because it's more efficient.
Squash merge is like a sledge hammer, interactive rebase + git reset -N HEAD^ + git-absorb + git add -p (or even better, Magit) are surgical tools.
- git-absorb - git commit --fixup, but automatic
sublime_merge
- I don't know why so many devs avoid a GUI for Git
- Sublime Merge – Git Client from the Makers of Sublime Text
- Ask HN: How to give a crash course on Git?
-
Lazygit: Simple terminal UI for Git commands
I've used this before and it is great. I mainly use Sublime Merge these days, though: https://www.sublimemerge.com/
-
Ask HN: Dev productivity tools you would pay for
Other good graphical git clients I have used in the past are Sublime Merge https://www.sublimemerge.com/ and SmartGit https://www.syntevo.com/smartgit/.
They are usually not expensive, and I learned git with GUIs.
- Top 10 Git GUI Clients for Linux in 2023
- Exploring the Top 10 Git GUI Clients for Linux in 2023
-
3 way merge tool as good as IntelliJ?
I’m in the same boat. The best I’ve come up with is sublime merge, works well but I miss the keyboard shortcuts and it being part of the editor
-
The github CLI saved me a lot of times
Even though I am pretty comfortable (or was) with git cli, I'm not going back from sublime merge
-
#gitPanic - Tools
Personally, I find it really helps me to see the repo history visualized as a tree, so I currently use Sublime Merge. I've used GitKraken and Sourcetree in the past. The git reference documentation maintains a list of git GUI clients, including mobile apps!
What are some alternatives?
git-autofixup - create fixup commits for topic branches
legit - Git for Humans, Inspired by GitHub for Mac™.
magit - It's Magit! A Git Porcelain inside Emacs.
git-gui - Tcl/Tk based UI for Git. I am currently acting as the project's maintainer.
stgit - Stacked Git
GitUp - The Git interface you've been missing all your life has finally arrived.
git-instafix - Amend old git commits with a simple UI.
GitExtensions - Git Extensions is a standalone UI tool for managing git repositories. It also integrates with Windows Explorer and Microsoft Visual Studio (2015/2017/2019).
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
desktop - Fork of GitHub Desktop to support various Linux distributions
transient - Transient commands
terraform-provider-wireguard - Terraform provider for WireGuard metadata