stgit
git-branchless
stgit | git-branchless | |
---|---|---|
21 | 55 | |
496 | 3,322 | |
2.2% | - | |
9.4 | 9.4 | |
10 days ago | 2 days ago | |
Rust | 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.
stgit
-
Nobody Cares About Your Git History
The article seems to present a dichotomy between what the author terms a "clean" git history, which he seems to think is a history where multiple commits are squashed into single commits that contain, I guess "one feature", and the unnamed "other" way of doing it, which the author doesn't really elaborate what exactly it is, but he appears to means willy nilly uncurated commits of whatever? To me, both ways he talks about are insane.
With something like stgit[1], it is dead easy to maintain a stack of curated, small un-squashed git-bisectable commits, and your commit history looks like the work of a supernatural genius who knows exactly what he's doing and rarely makes mistakes, and if you have to port your patches (commits) across multiple variants of the same source (think linux drivers ported to multiple distro kernels) that's easy too.
[1] https://stacked-git.github.io/
- Stacked Git
- Your GitHub pull request workflow is slowing you down
- stgit.el --- major mode for StGit interaction. Stacked Git, StGit for short, is an application for managing Git commits as a stack of patches like `quilt'
-
Jujutsu: A Git-compatible DVCS that is both simple and powerful
Pijul needs a 1.0 release if it wants wide adoption. I don't understand why they wait.
Meanwhile, if rebasing on git is an issue, you should probably try stacked-git (https://stacked-git.github.io/). It manages commits as a stack of patches - like quilt, but on top of git.
-
git-fc 0.1: a new fork of git for users
I just think there's a lot good ideas floating around the git community, for example Stacked Git and gitstatus, but somehow none of this connects with Git developers.
-
Stacked PRs – Pros and Cons?
Tangentially related, sometimes I find Stacked Git helpful when figuring out complex features or refactoring. Until it's nearly finished I'm not sure what would be worthwhile submitting as a PR but once it's ready then several smaller PRs are much easier to understand.
It's local stacked PRs and you can jump between them to edit as the ideas evolve.
https://stacked-git.github.io/
But if the nearby code is evolving quickly from other people this can be a bad approach because of merge hell when the work is finally submitted.
-
What do you do when your PR is in review?
Note: there are also tools like https://stacked-git.github.io/ to help manage this.
-
Request for Feedback:Checkpoint Workflow
Maybe checkout StGit: https://stacked-git.github.io/ I have not used it by myself yet, but I think it's capable of what you're trying to do.
- Bash script uses gh CLI to open patch stack
git-branchless
-
Ask HN: Can we do better than Git for version control?
Yes, but due to its simplicity + extensibility + widespread adoption, I wouldn’t be surprised if we’re still using Git 100+ years from now.
The current trend (most popular and IMO likely to succeed) is to make tools (“layers”) which work on top of Git, like more intuitive UI/patterns (https://github.com/jesseduffield/lazygit, https://github.com/arxanas/git-branchless) and smart merge resolvers (https://github.com/Symbolk/IntelliMerge, https://docs.plasticscm.com/semanticmerge/how-to-configure/s...). Git it so flexible, even things that it handles terribly by default, it handles
- Meta developer tools: Working at scale
- Show HN: Gut – An easy-to-use CLI for Git
-
Branchless Workflow for Git
> Is this for a case where a bunch of people branch from master@HEAD (lets call this A), then you need to modify A, so you then need to rebase each branch that branched from A individually?
Mainly it's for when you branch from A multiple times, and then modify A. This can happen if you have some base work that you build multiple features on top of. I routinely do this as part of rapid prototyping, as described here: https://github.com/arxanas/git-branchless/wiki/Workflow:-div...
`git undo` shows a list of operations it'll execute, which you have to confirm before accepting. Of course, it's ultimately a matter of trust in the tools you use.
- Where are my Git UI features from the future?
- git-branchless: High-velocity, monorepo-scale workflow for Git
- git-branchless
-
Show HN: Maiao, Stacked Diffs for GitHub
What happens is you work somewhere that has stacked diffs and suddenly you learn how to shape your diffs to make them easy to review. Thinking of how folks will review your code in chunks while writing it makes it cleaner. Having small but easy to read diffs makes reviews faster and helps junior devs learn how to review.
Sometimes this doesn’t happen in which case you end up need to split your commit at the end. This is where git utterly fails. You end up needing git split and git absorb to make this productive.
Git split let’s you select which chunks in a commit should belong to it and then splits that into a commit and then you do it again and again until you have lots of commits. You’ll still need to probably test each one but the majority of the work is done
Git absorb takes changes on the top of your stack and magically finds which commit in your stack the each chunk should belong to and amends it to the right commit
You also need git branchless https://github.com/arxanas/git-branchless as it lets you move up and down the stack without needing to remember so much git arcana.
- High velocity, monorepo-scale workflow for Git
What are some alternatives?
git-absorb - git commit --fixup, but automatic
graphite-cli - Graphite's CLI makes creating and submitting stacked changes easy.
misc-gitology - An assortment of scripts around Git
jj - A Git-compatible VCS that is both simple and powerful
git-autofixup - create fixup commits for topic branches
magit - It's Magit! A Git Porcelain inside Emacs.
pr-agent - 🚀CodiumAI PR-Agent: An AI-Powered 🤖 Tool for Automated Pull Request Analysis, Feedback, Suggestions and More! 💻🔍
vimagit - Ease your git workflow within Vim
delta - A syntax-highlighting pager for git, diff, and grep output
lazygit - simple terminal UI for git commands
bat - A cat(1) clone with wings.
libgit2 - A cross-platform, linkable library implementation of Git that you can use in your application.