Current landscape of branchless git projects

[hakanalpaydd]

I know this is a very open ended question, but as someone trying to recreate the easy VCS life I had while at Meta, I wanted to ask:

What are the differences between the branchless git solutions (that you know about)?

• git branchless
• jujutsu
• sapling
• stack pr
• ghstack
• git spr

non-FOSS lol:

• graphite

I'm inclined to think that git branchless strikes the best balance of:

1. actually solving my problem: making my devx better
2. not being a huge overhead to learn
3. being fully compatible with my job's traditional github approach

However, git branchless doesn't have hg split which mercurial had at meta, and that made my life easier for sure. (which sapling has)

git branchless doesn't automatically name your branches something internal like sapling/mercurial and jujutsu do. This is nice for my unique situation for JIRA ticket integration. This is a difference I've noticed between this project and others

And which would work best in my situation?

I work at a company that has JIRA, so being able to name my branches XXX-000_asablkjsd... is nice for getting that automatic JIRA integration I guess. Also we use Aviator for our merge queue, so I'm not even sure if stack-pr's land would work since that assumes you can merge directly to master (?)

One thing I noticed that was nice from stack-pr is that they automatically add a PR message that displays the stack for reviewers to see:

however I noticed all you really have to do to do this is:

---

1. #23655
2. -> #23537

---

with the PR numbers. And if you were to split a commit and resubmit the stack this message would be out of date anyways and need to be updated

[arxanas]

See #654 for a related discussion.

Tracking issue for git split is at #180 if you want to try implementing it. You can also use both jj and git-branchless in the same repo to some degree, if you want to use its jj split command.

git submit --forge github will render a similar message and try to keep it up to date (but the GitHub integration is generally buggy; see #1259).