autorebase
git-stack
autorebase | git-stack | |
---|---|---|
9 | 12 | |
77 | 11 | |
- | - | |
4.8 | 0.0 | |
4 months ago | about 1 month ago | |
Rust | Rust | |
- | Apache License 2.0 |
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.
autorebase
-
Where are my Git UI features from the future?
> It should be possible to sync all of my branches (or some subset) via merge or rebase, in a single operation.
Not sure if this is exactly what the author is looking for but I made Autorebase exactly for this.
https://github.com/Timmmm/autorebase
Great article btw. A lot of those things are way harder than they should be.
-
In Praise of Stacked PRs
That sounds great! I have partly solved this issue in my autorebase tool (https://github.com/Timmmm/autorebase) - it basically rebases every branch, and fixes the commit time so that stacked branches get preserved even after a rebase just because the hashes all match properly.
That obviously doesn't work if you modify or drop any of the commits, so this option is very welcome!
-
Lightning-fast rebases with git-move
I have a tool that will automatically pull master and rebase all of your branches onto it, or as far as it can without conflicts.
-
git-stack: Request for feedback / testers
I use a similar workflow and also got fed up with constantly rebasing branches so I made Autorebase to do it for me. It works really well and there were a surprising number of edge cases to handle, e.g. what happens when you run it from another worktree? What happens if the branch you want to rebase is checked out in another worktree? Etc.
- Automatically rebase all your branches onto master
- Autorebase - automatically rebase branches onto master
- Show HN: Automatically Rebase Branches onto Master
- Autorebase: Automatically rebase all your branches onto master
git-stack
-
[Gitoxide December Update]: a new object database and upcoming multi-pack index support
git-stack is the most complicated, rewriting history, detecting when a branch was squashed, etc
-
Lazygit: A simple terminal UI for Git commands
I used to use aliases but got frustrated with them when dealing with PRs depending on PRs, so I wrote git-stack [0]. Thought I'd share in case you'd find it useful
[0] https://github.com/epage/git-stack/blob/main/docs/reference....
-
Stacked changes: how FB and Google engineers stay unblocked and ship faster
For anyone interested, I've been collecting notes on various tools in this space: https://github.com/epage/git-stack/blob/main/docs/comparison... (granted the page doesn't mention git-stack since that is assumed)
-
Good strategy to follow for small incremental pull request
Personally, I rebase my PR branches on top of each other, rather than merge. It creates a cleaner history (if your merge policy allows maintaining branch history). Tired of managing these branches, I wrote a tool to help though there are other tools in this space, like git-branchless and graphite.
-
Lightning-fast rebases with Git-move
git-move and git-branchless do some great stuff, I wish this wasn't focused on the performance side to distract from the real value.
What I find useful is not the performance but this line
> For example, it can move entire subtrees, not just branches
The referenced docs mention other great quality of life improvements that streamline standard workflows (e.g. deleting local PR branches when merged into upstream)
When performance does matter is when the rebase operation is a small part of a larger operation. In my related tool, git-stack [0], I rebase all branches on top of their latest upstream branches along with re-arranging and squashing fixup commits and soon other features. When automating entire workflows, having each part be fast is important for the whole to still have decent performance.
[0] https://github.com/epage/git-stack
-
Continuous Integration with Github Actions and Rust
audit for security audits - Separate from regular CI since it only matters for specific changes or when new critical issues come out.
-
My favorite git aliases
You might be interested in git-stack that I've previously announced
-
git-stack: Request for feedback / testers
Could you comment on https://github.com/epage/git-stack/issues/25 for why it helps to iterate to find the last non-conflicting commit to rebase onto?
git-stack is the result of me being tired of annoyances in the PR workflow and trying to improve it, like
-
git-stack: Stacked branch management for Git
Fixing branches off of branches when applying a fixup commit (not implemented yet)
What are some alternatives?
git-stack - Stacked branch management for Git
ghstack - Submit stacked diffs to GitHub on the command line
sapling - A Scalable, User-Friendly Source Control System.
lazygit.nvim - Plugin for calling lazygit from within neovim.
git-assembler
graphite-cli - Graphite's CLI makes creating and submitting stacked changes easy.
git-prev-next - Simple way to edit in a git commit history
git-branchless - High-velocity, monorepo-scale workflow for Git
Git Town - Git branches made easy
feedback - Public feedback discussions for: GitHub for Mobile, GitHub Discussions, GitHub Codespaces, GitHub Sponsors, GitHub Issues and more! [Moved to: https://github.com/github-community/community]
GitUp - The Git interface you've been missing all your life has finally arrived.