git-imerge
git-stack
git-imerge | git-stack | |
---|---|---|
12 | 10 | |
2,665 | 480 | |
- | 1.5% | |
0.0 | 8.1 | |
12 months ago | 4 days ago | |
Python | Rust | |
GNU General Public License v3.0 only | 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.
git-imerge
- Dealing with Diverged Git Branches
- Pijul: Version-Control Post-Git • Goto 2023
-
Save rebase progress and attempt to cherry-pick?
Afaik, there's currently no official way to pause/stash a rebase/merge-in-progress. (There is git-imerge which supports incremental merges/rebases (basically split a big merge into smaller ones), but I never used it and think you'll need to use it from the start of a merge/rebase.)
-
I have a feature branch that is now way behind it's remote parent. How do I make this work?
Try git imerge.
-
What is the best way to undertake a heavyweight merge (dozens of files)?
If the merge is large in the number of commits involved git imerge may be useful to you. It breaks down one big merge into many smaller merges, essentially merging one new commit from each branch, one at a time. The advantage being that you only ever need to consider the conflict between two individual commits at a time.
- Git-imerge: Incremental merge for Git
-
strategy to update 2yo feature branch off of develop
The repo for it is https://github.com/mhagger/git-imerge and the blog post / instructions is at https://wilsonmar.github.io/git-imerge/
- interactive merge in git
-
Jujutsu – A Git-compatible DVCS that is both simple and powerful
Similar ideas have been discussed before in Git, but I don't think anyone has acted on them much. Michael Haggerty's git-imerge tries to make conflicts shareable, but I think it was more of a side-effect of the original goal of optimizing rebase/merge and auto-reducing conflicts to their minimal representation. I'm very curious how conflicts are represented in Jujutsu so I can better understand this power. I'm curious about how conflicts in conflict-resolution commits are handled and other such magic.
That gist seems like a simplified version of https://github.com/mhagger/git-imerge, so check that out if you haven't. (I haven't looked at git-imerge in a long time, so I should read about it again myself.)
git-stack
-
Pijul: Version-Control Post-Git • Goto 2023
I'm not seeing a git compatibility layer? So I think it's a neat project, but I probably won't try it because nearly all code is rooted squarely in git. Even if Pijul is perfect, you'd need to convince everyone else to use it.
Nevertheless, the increased interest in moving to patch based workflows from branch based ones is great. There's a lot of similar tools here (https://github.com/gitext-rs/git-stack/blob/main/docs/compar...) which I refer to infrequently.
Personally my favorite tool for living-with-the-reality-that-is-branches is git-machete (https://github.com/VirtusLab/git-machete).
-
Highlights from Git 2.38
This is huge. I've wasted so much time on this, I wrote my own tool. No idea how thoroughly they've implemented this though (what all corner cases does it update or not)
-
In Praise of Stacked PRs
> Probably some arcane git magic to (interactively) rebase branch
There is not really a command for that yet, short of adding a bunch of `exec` steps to your interactive rebase manually. See https://news.ycombinator.com/item?id=32217204 for an upcoming command.
You might enjoy using https://github.com/gitext-rs/git-stack, which specifically tries to let you manage stacked branches locally while not exposing tons of PRs to your coworkers.
git-branchless itself also lets you manage stacked branches in various ways. For example, you can do `git checkout `, `git commit --amend`, and then `git restack` to rebase all the descendant branches sensibly. You can use it on the local side of things only and then use Github PRs as normal.
-
Termgraph 0.1 released
I've been using termtree in my applications but I'm needing something more like git log --graph for git stack but haven't found a general purpose one (there is an implementation inside of git branchless) and haven't had a chance to make one myself.
-
Git PR management Tooling
Got a comparison of tools in this space at https://github.com/gitext-rs/git-stack/blob/main/docs/comparison.md
- Git-stack: Stacked branch management for Git
-
🗓 ⬇️ Lost in a sea of local branches? `--sort` might help!
I try to keep the number of branches down but git-stack provides something like git log --graph that collapses branches from other users and old branches, keeping the main view clean.
-
Code Review Decision Fatigue
Checkout https://github.com/gitext-rs/git-stack/blob/main/docs/compar... (note, the tool hosting this page is not included but as the author).
As the author of git stack, with all relevant biases, I recommend
- git stack for automating what you are already doing
- git branchless for more power at the risk of incombatibilities because its only as good as the data fed to git hooks
- jj if your open to something very different
What are some alternatives?
jj - A Git-compatible VCS that is both simple and powerful
graphite-cli - Graphite's CLI makes creating and submitting stacked changes easy.
elasticsearch-py - Official Python client for Elasticsearch
git-branchless - High-velocity, monorepo-scale workflow for Git
git-mergify-rebase - Merge git changes one commit at a time.
autorebase - Automatically rebase all your branches onto master
pg_similarity - set of functions and operators for executing similarity queries
tig - Text-mode interface for git
gumtree - An awesome code differencing tool
lazygit.nvim - Plugin for calling lazygit from within neovim.
mergify - Merge git changes on commit at a time.
spr - Stacked Pull Requests on GitHub