git-instafix
git-absorb
git-instafix | git-absorb | |
---|---|---|
1 | 22 | |
22 | 3,237 | |
- | - | |
7.5 | 7.5 | |
30 days ago | about 1 month ago | |
Rust | Rust | |
Apache License 2.0 | 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-instafix
-
Correct Git commits with Git-autofixup
If you start doing a commit (via `c` in the magit status buffer, with the standard semantics of "you're going to commit everything that's currently staged") you can press capital F for an instant fixup, or capital S for instant squash.
When you press either of those, magit pops up a commit picker which shows the current git log. Selecting a commit will then instantaneously apply your staged changes to the selected commit. It's much simpler than any of the other workflows I've seen in response to your question.
The gif in this repo (for a tool I made that simulates this behavior as a cli tool for some jealous coworkers) tries to show the workflow: https://github.com/quodlibetor/git-fixup
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
What are some alternatives?
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
git-autofixup - create fixup commits for topic branches
magit - It's Magit! A Git Porcelain inside Emacs.
scripts - Useful scripts that I find handy to work with
stgit - Stacked Git
transient - Transient commands
misc-gitology - An assortment of scripts around Git
citizen - A Private Terraform Module/Provider Registry