GitButler

Version Control for your Coding Agents

[GitButler @gitbutler]

Now GitButler has a CLI!

Stacked and parallel branches, smartlog, simple commit editing, easy undo, json output to every command. And it just works in any Git repo.

Check it out:
https://t.co/ltyOaitC6g

[GitButler @gitbutler]

@lylo @dhh At gb we like omarachy btw - it’s quite neat indeed :)

[GitButler @gitbutler]

not every task needs full worktree isolation and for those, parallel branches ans stacks are just faster.

ofc sometimes you do need worktree separation. stay tuned - we have some cool stuff cooking

[GitButler @gitbutler]

you don’t have to use worktrees to run multiple agents if you give them the gb CLI

check out this demo by @chacon https://t.co/ALE6C0rfPF

[GitButler @gitbutler]

@tomkrcha "multiplayer git butler like workflow" - you read our minds. and we have been cooking for some time.

would you be interested in early access to this in a week or so?

[GitButler @gitbutler]

@pavliscak @tomkrcha if you hit any issues - send a ping, and we will fix!

[GitButler @gitbutler]

@chirag_on_x @bzbetty its an abbreviation for "butler" - we promise it is all accidental.

[GitButler @gitbutler]

@chirag_on_x thanks for giving us a try. check out this vid by Scott for some cool ideas of what it can do - https://t.co/xdaARsKDUS

[GitButler @gitbutler]

@shrirambalaji when you have one branch (or a stack) checked out you will not see it.

The moment when you apply a second parallel branch though you will see `gitbutler/workspace` - there is no workaround that.

The main win is the app will be able to work in normal mode as well

[GitButler @gitbutler]

@shrirambalaji ops - pasted the same link as you 🤦‍♂️. The feature flag is:
```
{
"featureFlags": {
"singleBranch": true
}
}
```
On Mac: `~/Library/Application\ Support/gitbutler/settings.json`
On Linux: `~/.config/gitbutler/settings.json`

[GitButler @gitbutler]

@shrirambalaji we are making the `gitbutler/workspace` only show up when there are parallel branches - https://t.co/tdCBgZqckP

if you wanna try it early, there's a feature flag i can share, otherwise this should be ready for GA in ~2 weeks

[GitButler @gitbutler]

@Terwiel Thousands are already cooking with a Butler. But indeed - we are only getting started

[GitButler @gitbutler]

docs for what Scott is showing https://t.co/hLR4tGMnSp

[Scott Chacon @chacon]

Put out a new Butler's Pantry episode, showing how to use GitButler to run several agents in one working directory with parallel branches.

If you use agents and solve parallelism with worktrees, check this out because it's so much nicer.

[GitButler @gitbutler]

@BartInTheField this is really cool! thanks for making it!

[bwb @Brittain_Ben]

Many thanks to @gitbutler for making #gitmerge and #jjcon happen!

[Scott Chacon @chacon]

Live stream of JJCon, if you want to watch remotely

https://t.co/w6TUO5igiF

[Scott Chacon @chacon]

Check out all these awesome sponsors!

[Scott Chacon @chacon]

Setting up for Git Merge in Lisbon and this venue is pretty amazing.

[GitButler @gitbutler]

@RyanOlsonProgr Squash merges can be tricky - there is a corner case where if the changes that were squash-merged were modified by subsequent changes, it can be harder to detect it got integrated...

Do you have have a GitHub integration? That is used as an additional hint that could help.

[GitButler @gitbutler]

@simonhamp @JitPackJoyride in some cases worktrees are necessary (when full isolation is needed).

we are in the process of adding worktree support in GB - and they are copy-on-write, with seamless switching between parallel branches, stacking and worktrees (in any order)

[GitButler @gitbutler]

@bzbetty in the project switcher, if you hold down Cmd and click on a second one, it will open in a new window