This was amazing, please do more demos like this to showcase other things GitButler can do

I am crying with joy and want to kiss you people whoever is responsible!!!❤❤❤

@danielgun

Ай бұрын

really?

This is super exciting! Being able to quickly undo a commit and dragging and dropping is huge. Much more intuitive, esp for beginner users. Can't wait to check it out when it's on Windows!

@inzi27

4 ай бұрын

github desktop already does the quick undo thing

Over the past 6 months I've accumulated 40 stashes on my current project, ranging from redundant deployed code to critical fixes I've completely forgotten about. An hour playing around with git butler made cleaning all of those up super easy. One (pretty simple) feature request would be to automate the process of converting git stashes to gitbutler stashes. It was just a lot of stash apply, generate branch name, git butler unapply, stash delete.

@ardonjr

4 ай бұрын

This sounds more like a PEBKAC to me but okay..

@dustin6336

4 ай бұрын

I might be missing something, but couldn’t you have done the exact same thing natively? Such as, stash apply; create branch; stash delete?

@bitti1975

3 ай бұрын

@@dustin6336 I think the difference is that gitbutler allows to integrate these changes in a single working directory, while still keeping them in different (virtual) branches.

I have the feeling that this would make git way more accessible to normal people (in the sense of not tech savvy people) Great work!

Love this, especially with feature branch and bugfix, cant wait to try it!!

This is a very, very, very, very, very useful tool. thank you for the great explanation to demonstrate the work that goes into the tool. ❤❤❤❤❤❤

Wonderful workflow! ❤

This is really cool! I like how you covered very realistic scenarios that I would encounter in my day to day. I don’t know that I’ll be making the switch from CLI to gitbutler, but I’ll certainly give it a go!

We really need this on Windows, guys!

@notcorrect

4 ай бұрын

use WSL2

@MustaphaRashiduddin-zx7rn

4 ай бұрын

doesnt it work on wsl?

@michaldivismusic

3 ай бұрын

Seems like Wondows support is coming soon.

@ftamas88

Ай бұрын

It's out on Windows too now :)

this is actually really usefull. also a really good demo. i will definetely use this. downloading it now.

Subscribed, joined the Discord and all alerts on active. Can't wait to get my hands on this beauty for Windows.

Nice work guys, love the demo and the tool, please keep the snot-green background for your conference!

Interesting product and you just get started. I will watch its evolution. Thanks.

i think this is a really nice way to work pragmatically like in trunk-based development while still keeping things as organized/pedantic as feature branch

good stuff , subscribed and excited to tryout the product

Very nice! Recently stopped using sourcetree to vscode but I miss the GUI. Going to try this out today.

Love this so much!

looks very cool, 3:18 is where it all clicked for me. excited to try this out

amazing presentation and very good product

using git manually is gonna feel silly after this. awesome demo! from someone who normally shuns Git UIs

i have seen git ui clients come and go, but i think, i prefer to stick to the terminal. in the end, the cumbersomeness of handling git in the terminal, makes you think more about the consequences your actions have, and thus improve the overall quality of the versions and history of your project.

@jerbear7952

4 ай бұрын

This is for a different type of person

@miko007

4 ай бұрын

@@jerbear7952 what kind of person would that be? a person that uses git, i would assume...

@b42thomas

4 ай бұрын

I'm with you here, a lot of tools like this try to reduce friction but often friction helps you slow down your thinking and make better judgements in the long run.

Soooooo promising! For sure I will try it Wondering how it manages conflicts

Very curious to see what it does with overlapping changes. This looks great!

I want early access rn! Absolutely amazing

This sounds great!

This feels like it would make version control and such much accessible to non technical people. (Book authors for example)

Superb!🎉

Seems grate! going to check it out.

this is revolutionary!!

This has the potential to replace my git worktrees workflow. I’m excited to try this out and see. My main concern/question is how it’ll handle different versions of package.json dependencies across branches & how much friction that adds when unapplying new versions to focus on a fix burtual branch before jumping back to feature work.

thank you so much~

Cool stuff. Will give it a go

すばらしいです！ありがとう

Yooo, thats so cool. Will try this

Amazing ❤❤

This was the happy path, what about when the changes conflict?

Amazing cant wait when it hit on windows 💯

this looks excellent

You had me at squash

the virtual branch concept is really nice. not a big git GUI proponent bcs I've seen so many devs avoid ever learning git well and the risk of something like this is that entire generations will have no idea how to use git without something like this. but excited to see what the cli implementation of virtual branching looks like

5:16 love that cut away at the end! was not expecting that.. what a view! what mountain range is that?

Looks quite intereesting ... will be playing with it soon

That looks super cool! How does this surface/handle merge conflicts if you want to reorder/apply patches in different order? (I have been using Stacked Git for this type of thing)

@gitbutlerapp

4 ай бұрын

Currently we don't let you reorder commits by drag/drop, but when we do we simply won't allow you to do it. There are a lot of interesting use cases around changing history - folding, splitting, reordering, etc - and we want to be simple and clear when we allow it. We allow you to do squashing, undoing, amending, but those are pretty clear operations. We'll get to more fun stuff soon!

This is unlike anything else I've seen. Are there any plans to add the ability to pick individual lines within a file for commit? Sometimes multiple changes are made to a single file for a variety of reasons, or you might be creating a pull request for an upstream repo.

the question is do i really need a separate product as i like to do all this from my ide

Amazing product, cant wait for enterprise version - I know a lot of folks at work who would prefer such approach to a regular "oh I'm sorry I created a PR with 10 structural decisions, but I need to go so please merge" . Q:Is it a local LLM creating generated messages?

How about specific brand names? We start our branches with the project tag/ticket id: i.e: XX-1234-whatever-the-ticket-says. Commit messages I personally do: tag/ticket id: type of change: short message. XX-1234: feat: add detail page to event Are custom messages/branch names supported?

@gitbutlerapp

4 ай бұрын

They are. In the dropdown menu, you can set the remote branch name specifically. If you don't, however, we'll figure out one for you.

What do the changes in the remote repo look like? (maybe I missed it) In other words, is there provenance, or an audit trail, on the repo for these discrete changes?

Really cool!

@GitButler does the tool support stacking branches? For example, if I want to split feature changes into part 1 and part 2 branches, and base the part 2 branch on the part 1 branch?

That seems to have some potential 👀

Sublime Merge feels better. I feel more in control.

I think you should make clear case for your license. I think it's a great compromise (not-quite-open (no compete) for 2 years, truly open (MIT) afterwards), but it can still be confusing if people hear your code is open and confuse it for simply MIT all the time. I'm personally a little unsure if the 2 years counts from each commit, release, or for the entire project (probably each commit but this isn't spelled out clearly enough). On another note, I love the tasteful use of Serif in the UI.

@gitbutlerapp

4 ай бұрын

We tried very hard to not use the term "open source" in this video. There is a confusion in the industry today between the OSI-definition-aware people who understand it to mean an OSI approved license that sufficiently satisfies the 10 OSDs and the rest of the world who thinks it generally means what OSI would term "source available". We're trying to be clear, but since our license is a little new and the terminology is muddled (it's _very_ clear to one party and the other party has no idea there is a definition) we tried to toe the line with "our code is now open". It was very specific phrasing to avoid saying "open source". For a more insane rabbit hole to go down, you can read the FSL issue on terminology that we're currently trying to participate constructively in: github.com/getsentry/fsl.software/issues/2

@gitbutlerapp

4 ай бұрын

Also, the answer is a rolling 2 year window from each commit.

Awesome!

This is incredibly based. I love it

Hooray 🙌 🚀

super cool!

Seems amazing, but it's a standalone (local) tool? I do a lot of work on remote workstations (VS Code SSH/Dev Containers) where it's more involved to use local tools. Any plans to make a VS Code extension or similar?

Exciting product! ♥

Amazing :)

Careful about creating a branch automagically because they may not be off of trunk, main, develop, or whatever main branch is called as sometimes new work should be derived off a feature or release branch. Otherwise, looks very exciting.

Can’t wait for a windows version, hope it isn’t too far out!

@gitbutlerapp

4 ай бұрын

Working on it!

Nice, I like it. I’d love it more with a NeoVim plugin, where you can do mouseless switching and toggling of virtual branches.

@gitbutlerapp

4 ай бұрын

We would love to standardize an API or local server where we could enable plugins like this. You're right, it would be very cool.

Hi Scott, I love this concept and the idea that it takes care of all the stuff so that I don't have to take care of it and more importantly make any silly mistake But as a developer who is used to writing commands on the terminal, gitbutler seems like too much use of the mouse. Can you tell me if these features are accessible from the keyboard too, shortcuts maybe? Also, I personally would like it more if it's an extension on my code editor rather than another app on the device(one of the reasons I hate the GitHub desktop) Waiting for more such demos And best of luck❤

Nice, hope you add azure support!

Used it now for about 3 weeks. While I really like the concept it seem like a pretty unfinished product at the moment. Difficult to point out anything specific but overall using it is not always so smooth. But for the most basic flows it works. Also would definitely prefer a CLI over the UI.

This is sick aff, but sad its not in windows yet. The tech stack is really mind blowing.

@gitbutlerapp

4 ай бұрын

Super sorry about that. We're almost there, but there are some bundling issues with OpenSSL for libgit2 on Windows that we need to figure out. Hopefully soon!

@liamwinterton7370

4 ай бұрын

@@gitbutlerapp I'd love this to be on windows!!

Welp, let's see how this goes! 🚀🚀🚀

Isn't this nearly identical to changelists in IntelliJ IDEs? I can already split out changes into separate changesets without changing the current branch using that mechanism.

@HaxxBlaster

4 ай бұрын

I was about to say the same, i used it for years

@TwoLeggedTriceratops

3 ай бұрын

I was about to say the same. I guess a lot of other products strangely do not have this feature.

So, it looks like automation, where you have a local brach with a mess of commits, but when you push to a remote branch it do auto squash. Is it correct, or am I missing something?

Nice tool!

@gitbutlerapp

4 ай бұрын

Thanks!

Awesome, need it as a vscode extension

@gitbutlerapp

4 ай бұрын

We would love to do this someday.

It looks good but... what happens if the fix requires changes in the same file that has local modifications?

This is awesome

@gitbutlerapp

4 ай бұрын

Thanks! We think you're awesome too.

Multi-branch! Yes! I love drag and drop to manage commits and squash them. It's a better `git rebase -i` Now make branch-on-branch easier. In my experience, this has always been a brittle and error-proned workflow. Aka, don't accidentally merge onto the wrong branch!

If a rebase creates a non linear changeset, it'd be great if this tool could move everything to a new branch, and supercede the existing one to avoid force pushes. Immutable branches in git wouldn't be hard if git butler already owns the creation and management of them.

@gitbutlerapp

4 ай бұрын

Technically you can do that with GitButler. If we rebase something or change the history because of an action of the user, we show you that we would have to force push it. If you don't want to, all you have to do is change the target branch name. You only have to force push if you want to overwrite a branch. If you want to just create a v2 or whatever, force pushing is not technically needed.

I am impressed. Waiting for Windows version to try out.

@gitbutlerapp

4 ай бұрын

We are working on it, but git2/openssl on Windows is being a little bit of a pain. Soon!

@Tidbit0123

4 ай бұрын

@@gitbutlerapp Cant wait! Is there somewhere I can subscribe to get email updates on this?

i'm installing gitbutler

I dound the gui really appealing

@human4566vv

4 ай бұрын

Real people never leave terminal, stupid whine about ui

I mostly work on a remote machine (university cluster) using VS Code. Is it possible to use GitButler for this kind of setup? Maybe a VSC extension or SSH capabilities inside GitButler? Great tool anyways, I will probably use it for my local git repos

@gitbutlerapp

4 ай бұрын

We're looking into it. VS Code has a really interesting remote plugin execution architecture. None of us have had to use that yet, but we're looking into what that might entail. It might be a little difficult, since we have a filesystem watcher that we rely on for some operations (and we'll probably rely on more as we try to optimize speed) but perhaps it's possible.

This is exactly the workflow I have with IntelliJ's changelists. Not sure if another tool worth the learning effort.

@gitbutlerapp

4 ай бұрын

IntelliJ's changelists are very nice. There are a few issues that we cover (in our view) a little more nicely. The biggest thing of course is that you have to use IntelliJ. With us you can use any editor you want (or even multiple editors - sometimes I use VS Code mostly and then nvim on the command line for quick fixups). The other is that changelists are not saved until you commit. We sync your progress all the time so most every change is recoverable. One big thing is that you cannot collaborate on features with Changelists. With virtual branches you can commit, push and update upstream changes within a vbranch, all independently. Changelists are cool, but we would like to argue that vbranches are good at everything you would use them for and better at many other things additionally. Plus I think our UI is much easier to use than the IntelliJ changelist option.

when is the windows support?

Good intro

I CANT WAIT to work with a team that have no idea how git works. What’s a branch? What’s the rebase thing you keep talking? How do we swipe left inside our CI pipeline? 😅

This looks awesome! Can't wait till it comes to Windows.

@gitbutlerapp

4 ай бұрын

Us too. Working on it.

Any plans for support to Bitbucket?

This seems more suitable for web based development. How about C or C++ project which needs to compile to take effect?

Neet. There's business value here since I run into people every day that can't be bothered to learn git, despite it being prereq No. 1 for becoming a dev. :p

@gitbutlerapp

4 ай бұрын

We're all seasoned Git pros (even the guy who wrote Pro Git) and we find it pretty useful. We're hoping it's useful to long tooths and newbies alike. :)

@Komeuppance

4 ай бұрын

How about us snaggletooths?

Are these functionalities GUI only? Or is there some way to expose the gitbutler API for CLI use as well?

@reed6514

4 ай бұрын

This! This would be great. I live in nvim and my terminal. (Ok not really, i do use an actual web browser and email client lol)

@gitbutlerapp

4 ай бұрын

They are GUI only now. We've been trying to figure out what a TUI or GUI might look like that could work well in the way we want it. Perhaps soon.

Loved it on my mac. Unfortunately, we use Windows at work. I really hope that a windows release comes soon!

@gitbutlerapp

4 ай бұрын

We're working hard on the port. There are some openssl/git2 issues that don't seem to play well out of the box. We'll hopefully get there soon.

Cool and many of these I can already do with Jetbrains' built-in tooling.

Do you also auto fetch the repos or is it more a „pre-fetch“ only?

@gitbutlerapp

4 ай бұрын

We actually auto-fetch them and update the refs/remotes references.

@berndeckenfels

4 ай бұрын

@@gitbutlerapp yeah ,)

Would love to see a comparison with Graphite!

@gitbutlerapp

4 ай бұрын

The simple version is that Graphite seems to advocate stacked branches whereas we try to facilitate parallel branches so they are not dependent.

You should put links to your stuff in the video description and in the channel description

Ayyyyyy

are there plans to integrate this into vscode/cursor IDE?

@gitbutlerapp

4 ай бұрын

Probably, but it's not simple to have a good VS Code integration. Right now we update the index in a way that makes VS Code at least report correctly which files are modified and whatnot, even though it cant report which vbranch this or that change is in.

Will it work with non github instances for pull request and stuff?

@gitbutlerapp

4 ай бұрын

It will not right now. We will eventually implement GitLab as well, but it's not yet started.

Is it in RC ?

I've been wanting something like this since forever, hopefully it can create virtual branches off of any current branch and not just main/master? Looking forward to Windows support

@gitbutlerapp

4 ай бұрын

We're working on Windows support, hopefully soon. Currently it needs to have a "base branch" which could theoretically be anything, but whatever is "production" (ie, whatever you're "branching" from) is generally origin/main or origin/master (maybe origin/development if using Git Flow), etc. But any of your existing branches ("feature-branch-a") can be converted into a virtual branch which can then be applied at the same time as any other virtual branch. If that makes sense. :)

@notproplayer3649

4 ай бұрын

​@gitbutlerapp will there be Linux support ?

@gitbutlerapp

4 ай бұрын

@@notproplayer3649 We have AppImage and deb builds for Linux. You can download them directly from the home page.

@notproplayer3649

4 ай бұрын

@@gitbutlerapp I totally missed it, thanks !

@monochromeart7311

4 ай бұрын

@@gitbutlerapp why not distribute it as a flatpak?