The only version control tool built from the ground up for modern, AI-powered workflows.

github.com/gitbutlerapp
Pinned Tweet
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: blog.gitbutler.com/but-cli
15
27
254
50,999
GitButler is now open source! We think we're building a pretty amazing tool and want to include everyone and build it in the open. Read more about our decision here: blog.gitbutler.com/opening-u… And take a look at our Rust and Svelte code here: github.com/gitbutlerapp/gitb…
20
31
162
69,901
Insane deathmatch with @romero at #diemerge
7
18
158
53,568
GitButler's source code is now open! We think we're building a pretty amazing tool and want to include everyone and build it in the open. Read more about our decision here: blog.gitbutler.com/opening-u…… And check out our Rust and Svelte code here: github.com/gitbutlerapp/gitb…
6
14
94
16,774
We're getting close to releasing a brand new approach to branching in Git. Check out @chacon's demo, get excited about virtual branches, and read all about how we built it on our shiny new blog: blog.gitbutler.com/building-…
5
14
70
13,056
We're teaming up with @github to bring an Open Source Fair to THE MERGE! If you are interested in showcasing your OS project, follow the 'apply now' button on the merge.berlin website. Selected projects get a free ticket to conf! See ya there!
4
20
65
81,871
If you're curious what GitButler looks like now, our CEO made a 5 minute demo. Check out virtual branching in our beautiful new Git client.
4
9
62
23,322
Do you love Git? Are you working on cool things in the Git ecosystem? GitButler is partnering with @github to host the Git Merge developer conference and contributor summit this September 19/20th in Berlin! Join us (or submit a talk)! git-merge.com
6
10
45
32,340
We can barely stand on our feet but IT’S A WRAP 🙌🎉 THE MERGE was amazing, thank you all for coming out!!What awesome speakers we had on stage, you rock: @mojombo @jaysimons @romero @kdaigle @cassidoo @saronyitbarek @_adamwiggins_ @robbyrussell @zeeg @CrabNebulaDev @leahculver @janaboruta @jzmusings @chacon
1
5
35
23,834
Next on the lineup for ✨THE MERGE✨ is @zeeg founder and CTO of @getsentry. We’re looking forward for David to share his knowledge on open source - from contributor to growing an open source company - this guy has been around. Join us on June 13 & 14 in Berlin for🔗merge.berlin
1
1
10
7,447
GitButler is proud to be joining @sentry and other amazing companies in the new Fair Source movement. We've been publishing our code under the FSL license for months and believe this can help make more code available from other great companies. blog.gitbutler.com/gitbutler…
4
18
1,591
Exciting news! 🎉 We've added GitToc to GitButler! Now, you can share not only your code commits but also make pull requests for dances, share photos and videos of your life and your coding journey. 📝👩‍💻 Join us in this fun new way to connect through coding! 🚀
3
18
1,762
The Merge is this Thu/Fri! We'll try to live blog-ish the Merge behind the scenes here for those of you who have never thrown a conference and are curious what it looks like. This morning, Pat, Megan and Lisa rent a van and move our Doom computers and more to the venue.
18
2,280
Exciting news: @github co-founder Tom Preston-Werner @mojombo, known for "making stuff" (like the biggest developer platform out there), will speak at THE MERGE. We are super excited, like really! Join us in Berlin for his and many more insights this June. merge.berlin/
1
1
15
7,141
🎉Announcing @cassidoo will take the stage at THE MERGE! 🌟Javascript & React pro, CTO, and content creator - Cassidy is a beloved figure in the developer community. Catch her at #THEMERGE in Berlin on June 13 & 14 merge.berlin/
2
15
4,730
Great turnout last night to our Sip and Git event. Great conversations, pizza and beer. Thanks everyone for coming out on a rainy Berlin day!
1
16
863
Anne is busy sorting all the badges for fast lookup. Wish her luck. #diemerge
1
12
519
We're trying a new experiment to help us build more in the open. We've moved our company chat from Slack to Discord so you all can watch what we're doing and participate in our building process. What if you could join the engineering room of any company? blog.gitbutler.com/the-new-e…
2
12
629
Unboxing some #GitMerge2024 swag. Warning: These shirts may cause severe coding envy. Proceed with caution 😎 Grab your tickets here git-merge.com
11
996
Another ✨star✨ joining us at the MERGE! Software developer, dev advocate, and content creator, @ChloeCondon has many talents. Did we mention she’s also a musical theater performer?🎤We can only hope she breaks out in song about her experience at @Google , @Microsoft & @getsentry. June 13 & 14 in #berlin 🔗 merge.berlin/
1
2
9
2,801
Missed @chacon's FOSDEM talk on Git tips? Or maybe got kicked out of the overflowing room? We have the whole talk up on our YouTube page now. piped.video/watch?v=aolI_Rz0…
3
3
14
5,408
We've been asked a few times recently how our virtual branches differ from git worktrees. If you're curious (or if you don't even know what git worktrees are), check out @chacon's new post on them: blog.gitbutler.com/git-workt…
3
13
2,798
We are just 2 weeks away from THE MERGE🤯🙌! Agenda is up🕺! Open Source Exhibitors are up🕺! More details are up🕺! Go check it outttt --- merge.berlin
7
10
2,403
Aaaaand, Tipsy makes it to the venue. The Arena is coming together for you all tomorrow! Let’s get ready to MEEEERRREGGGEE #diemerge
1
8
664
Last week, we shipped a release version of our GitButler for Windows build! If you're rockin' the Redmond, we would love your help testing our beta: blog.gitbutler.com/gitbutler…
2
2
10
2,532
Do you know what "--force-with-lease" is in Git? How about "git maintenance"? Or "git column"? Our own @chacon has written up some recent additions to Git that might well be news to you. blog.gitbutler.com/git-tips-…
3
10
2,119
Megan nailing a heel kick with the grace of a ballerina in our currently (but not for long) empty venue. Getting ready to Merge it up.
7
398
Is it possible to have too many GitHubbers at one dev conference? We don't think so! Current, @github COO @kdaigle will bring his insights and knowledge on building and scaling engineering teams within a remote-first, AI-integrated, developer-centric company to THE MERGE🚀. Link — merge.berlin 🗓️June 13 & 14 in #Berlin
2
1
9
57,354
🎉If you haven’t figured it out already, our CEO (co-founder of @github), @chacon will be co-moderating THE MERGE🎉. Scott not only has A TON of stage presence (he's a pro karaoke'r 🎤), but he also has personal relationships with many of the speakers, which will only make for great content 👯‍♂️. June 13 & 14 🔗merge.berlin
1
11
765
Want to keep your Git commit series nice and clean when you get feedback? Check out Git's fixup commits and autosquash rebases. (Coming soon to a GitButler near you). blog.gitbutler.com/git-autos…
2
10
2,988
Check out our newest addition to THE MERGE speakers list 🔥! GitButler is built on Tauri, so we can't wait to chat with Daniel on stage this June! @TauriApps
2
9
5,079
Did you know you can use vanilla Git today to manage a 300GB repo of 3.5M files receiving a push every 20 seconds from 4000 developers without problems? Read on! #scaleGit blog.gitbutler.com/git-tips-…
10
3,644
Open Souce Fair powered by @github is booming even during main stage talks 🙌❤️. Lovely folks if you could whisper a bit more to enable people listing to the talks, we would really appreciate it 🙈 (totally our fault, thanks for helping 🙏)
1
8
913
We had over 1200 awesome Git users fill out a survey about how they're using Git and what they think could still be improved. We've crunched all the data and are happy to present: the Git Zeitgeist Report! blog.gitbutler.com/git-zeitg…
2
9
2,862
Did you not get enough of @chacon's So You Think You Know Git FOSDEM talk? Well you're in luck, because here is an all-new content Part 2: piped.video/watch?v=Md44rcw1…
1
2
8
2,876
Anne, Megan and Lisa putting together our speaker welcome baskets. Hopefully hotel actually gets them in the rooms. Our hopes are … not high 😂 #diemerge
2
8
615
Getting ready to MERGE
7
505
Happy to announce that we're letting more people into our new Virtual Branches alpha! Be the first to experience the a brand new way to branch in Git. We just made two new videos walking through our new virtual branches functionality, so check 'em out. piped.video/watch?v=xVZWTmW-…
2
2
9
9,473
We are getting the Berlin Git community together for Git-together on August 14th in the GitButler offices! Join us if you're around. Sign up here: meetup.com/gitbutlers/events…
3
9
999
If you're in Berlin join us for our Typescript meetup next Thursday (18.04) with talks from our CPO, @TejasKumar_ and @pesterhazy! And of course 🍕 & 🍺. Sign up here: meetup.com/gitbutlers/events…
2
5
4,055
🍸 Mixing code with cocktails at @WeAreDevs
5
505
Listen to our CEO @chacon chatting about Git, GitButler and the future of version control with the @changelog chaps!
🙌 New Changelog interview! 📌 Replacing Git with Git 😎 featuring @chacon from @gitbutler 🫡 with @adamstac & @jerodsanto 🗂 tagged #git #startups @GitHub 🎧 changelog.fm/586
7
962
A wild Tipsy, spotted in its natural environment. #diemerge
5
383
Tipsy is getting ready to ROLL. @krlvi will be riding the Tipster all the way to the Arena venue from our office to serve margaritas tomorrow and talk @gitbutler. #diemerge #GitBUTTler
1
5
484
Sorry for the queues guys. We hope you still liked your lunch 🥗
1
4
424
Git got you in a twist? 🌀 Git Merge 2024 is your rescue! Join us Sept 19-20 for Git talks, workshops, and more! #GitMerge2024 #GitConference #GitHub 👉 git-merge.com
4
7
1,204
Very brave ppl on stage today
1
7
318
Another Community Queen👑 joining us at THE MERGE - @janaboruta former Director of Community at @HashiCorp and VC at TQ Ventures. ✨Jana knows a thing or 2 about building dev communities, as she grew HashiCorp’s from 0 to 1 million members🤯. Join us at merge.berlin on June 13 & 14!
4
2,531
Flexing the product ⧓ with @chacon dancing 🕺🏽 #wearedevs #wwc24
1
6
677
📢Announcing THE MERGE speaker @samlambert, CEO of @PlanetScale and previously VP of engineering at @github (we promise it's the last G'Hubber on the lineup 😂). We're just 2 months away from merge.berlin - get your tix & your party hats ready🤠🎩🥳
5
709
Oh My GoZsh🤯! @robbyrussell creator of the highly popular open-source, community-driven framework @ohmyzsh🐚will be joining THE MERGE. Come listen to his journey building Oh My Zsh and the lessons learned along the way. June 13 & 14 merge.berlin
2
5
5,160
@_adamwiggins_ doesn’t normally join a stage anymore but he made an exception for chatting with @chacon. What an awesome fire side chat! Thank you for that @_adamwiggins_ #THEMERGE #diemerge #heroku #gitbutler
1
6
189
Like any early-stage startup before product-market fit, GitButler is hosting its very own crazy developer experience conference. We already have a killer lineup. Come check this out :) merge.berlin/
2
5
1,804
Thanks for joining us Jana! You were a real vibe on stage 😎
I was on the closing panel of The Merge, so I brought a little spice and fun. Maybe a lot. Half way through the talk @chacon brought me another glass of wine. This was a really wonderful conf. Congrats to the @gitbutler team.
5
620
People lunch is ready outside. We are hope you are hungry ☺️
6
477
Tipsy is on its way, people. #diemerge
4
483
@_adamwiggins_ typically away from the spotlight these days, but he's making an exception to join us at THE MERGE for a fireside chat with @chacon. Get ready to dive into the unique founding story of Heroku. Fun fact: Did you know Heroku was a pioneer in developer-friendly cloud computing, popularizing Git-based deployments? Can't miss! #TheMerge merge.berlin/
1
5
2,706
Tipsy has a pretty cool Berlin bartender today. Go get a marg and talk GitButler with @krlvi
5
276
Gitbutler Demo und Margaritas 🙌🙌
1
4
1,753
Ämmmm DOOM going strong around the clock. Get your scores in and then next up winner against the Creater on MainStage 😅
1
3
345
Also, man without our special Caleb, this game world wouldn’t have worked. Thank you so much🙌
4
189
📢Announcing our next speaker for THE MERGE - @leahculver 🎉! Leah is a 3x startup founder, Y Combinator alumnus, and a full-stack and mobile engineer. If you didn’t see her tweet - this ex-twitter dev is ready to spill the 🍵tea🍵 about her time at Twitter.✨You can’t miss this June 13 & 14 in Berlin! merge.berlin
2
3
2,520
We are excited to announce one of our moderators🎤@saronyitbarek ! Saron not only has an excellent stage presence, but she also has the know-how.🌟She is a founder, developer, and community builder herself - the perfect combo to host THE MERGE. 🔗 merge.berlin June 13 & 14 in Berlin
3
6,675
@kdaigle doesn’t get a break today, now on with Scott to talk about @GitHub now and then on the main stage. He is such a great person to listen to ☺️.
2
40
What if Git didn’t suck?
4
275
@zeeg has worked 3 stages today and thinks we must be tired of him by now. We are nooooooooot! Thanks for your brutal honesty at all times 💪.
1
3
2,568
Do you want the chance to play @romero in a DOOM deathmatch🎮? Well now is your opportunity. John, creator of @DOOM and Game Director of @romerogamesltd, will not only join us for a talk, but also play the winner of a DOOM tournament🏆. Who’s in!? June 13 & 14 in Berlin merge.berlin
3
2,872
To be clear, the code is available under the Functional Source License, which is not an OSI approved "open source" license. The source is available under MIT like terms under all circumstances other than using it for direct commercial competition with GitButler. Which is basically everyone.
3
3
2,920
Follow up: @chacon didn’t cope well, there was tears, one tiny break down and some drama #diemerge
1
3
195
@kdaigle talking about investing in remote first as a concept for a company like GitHub 😎
2
39
Replying to @github
If you find Git interesting and are not reading these @github writeups on each new release, you’re missing out. Taylor does a great job digging into new complex topics and explaining them.
1
124
@jaysimons in a fireside chat with @chacon that truly is on fire. While chatting early days of Atlassian, both eat some of the hottest sauces on this earth 🔥🔥🌶️🌶️. There is some crying involved but both of them are holding up really well 😮‍💨
1
3
327
@romero opening the 2nd day at THE MERGE 🙌. He will be back on for the death match of DOOM later today 🔥
2
37
It's a good point - we just changed that to be optional.
1
49
Replying to @MaxStalker
We've had the idea of a "magic button" that would just do everything for a while. Now that we can do all of this stuff, it would be pretty simple to add a "I'm Feeling Lucky" button.
2
2
49
If you could hire a great intern to just handle your git/version control tasks for you, what would you have them do? 🤭
1
1
2
883
Also, very technically, GitButler is automatically saving every change you make to every file all the time in a hidden CRDT format, so it is already auto-saving, we're just not showing it to you yet. SOON.
2
46
Replying to @andrew_stanton
We find it funnier this way. Trust us, Scott spells better than AI.
1
22
Luckily you can do just that!
1
2
16
3 more days! We can't wait 🙌
2
101
In addition to the new overview video, we also have another one showing off more advanced functionality like resolving merge conflicts, previewing remote branches and even looking behind the scenes on the command line a bit. piped.video/watch?v=WGwFa8WE…
1
352
Sorry about this. Our latest release should help with both of these problems very directly. We now have an undo timeline where you can nearly always revert to a previous state very easily if anything should go wrong.
1
15
Sorry all. We haven't noticed it in our internal testing. We'll see if we can speed it up and work out some benchmarks to keep this from regressing again.
1
1
38
Replying to @ericclemmons
Sorry about that. If you email us at help@gitbutler.com we can almost certainly help you recover it.
1
36
🚀 Any communities out there interested in scoring some free tickets & an exclusive discount to THE MERGE? Our doors are wide open for THE MERGE Community Partnership Program! Slide into our DMs & let's chat! 💌 Details here 👉 merge.berlin
1
635
Update. At least one of the baskets did not make it. Our hopes were... exactly at the right level.
1
185
Replying to @ELahti @pcgamer
scott@gitbutler.com 👍
1
171
Replying to @surya_devta
We're hoping to have a signed Windows build available in the next few days. Keep an eye on this account for our announcement.
1
1
22
Replying to @alienopolis21
You can squash by dragging one commit onto the one below it. Cherry-picking isn't in our feature set yet. We'll get there!
1
487
It’s made by a company called Paul&ernst
1
58
Yup. We have some video of it that we'll put together for YouTube as well. Up soon!
1
1
118
If we're live-blogging The Merge, we should probably have a hashtag. What does everyone think about @JordiMonPMM's suggestion #diemerge?

ALT Simpsons Die GIF by Pixel Bandits

1
424