misc-gitology
git-autofixup
| misc-gitology | git-autofixup | |
|---|---|---|
| 1 | 3 | |
| 35 | 166 | |
| - | - | |
| 3.9 | 7.9 | |
| 8 months ago | 4 months ago | |
| Python | Perl | |
| BSD 2-clause "Simplified" License | GNU General Public License v3.0 or later |
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.
misc-gitology
-
Stacked Git – manage commits as a stack of patches
@jpgrayson (since I see you lurking around here) Thanks for maintaining stgit! I've been a recent convert and it's a great workflow improvement. I used to be a big `git rebase -i` user and stgit works so much more fluidly and fits great with my mental model of how I want git to behave. Thanks!
I'd love to add functionality that mimics `git rebase -i`. That is, you would open an editor and be able to select which patches you want on your stack as well as possibly designate patches as 'squash' or 'fix' from your editor. Think of it as `stg sink`, but able to operate on multiple patches at once.
Prior art: this script[1] already performs a re-ordering of commits but in a pretty hacky way. I'd like to productize it!
I'd love to have this new `stg rebase --interactive` be part of the main repo to enjoy the benefits of the existing test suite. My question for you is around how to include the new command with the rest of the tools. Would you want it to integrate with the existing rebase command (`stg rebase --interactive`) or is it something more appropriate for `contrib` (so a new independent command like `stg-rebase-interactive`)?
[1] https://github.com/da-x/misc-gitology/blob/master/stg-rebase...
git-autofixup
- Git-autofixup: create fixup commits for topic branches
-
Stacked Git – manage commits as a stack of patches
Somewhat (or possibly greatly) related:
Are tools like git-absorb safe/reliable?
"Essentially, when your working directory has uncommitted changes on top of draft changesets, you can run `hg absorb` and the uncommitted modifications are automagically folded ("absorbed") into the appropriate draft ancestor changesets. This is essentially doing `hg histedit` + "roll" actions without having to make a commit or manually make history modification rules."
I haven't wrapped my head around the algorithm. I get that an algorithm can "recollate" a series of commits in a way that yields no commit conflicts, but that's not the same as rearranging and combining commits into a sequence of semantically coherent atomic commits.
---
https://github.com/tummychow/git-absorb
https://github.com/torbiak/git-autofixup
-
Correct Git commits with Git-autofixup
git-autofixup can also be installed by simply downloading the script[1], giving it execute permissions, and putting it somewhere in your PATH. It needs perl 5.8.4+, which is very old, and only depends on the standard library. Git ships with a Perl interpreter on Windows.
If there are any staged changes, git-autofixup only fixes those up and ignores any unstaged ones; otherwise it tries to autofixup all unstaged changes.
[1]: https://github.com/torbiak/git-autofixup/blob/master/git-aut...
What are some alternatives?
git-absorb - git commit --fixup, but automatic
stgit - Stacked Git
magit - It's Magit! A Git Porcelain inside Emacs.
git-instafix - Amend old git commits with a simple UI.
GUIDeFATE - GUI Design From A Text Editor
vim-fugitive - fugitive.vim: A Git wrapper so awesome, it should be illegal
scripts - Useful scripts that I find handy to work with
PerlDistSite-Template - Template for a PerlDistSite Instance