A quick demo of how GitButler can help you manage your Git branches. gitbutler.com
Пікірлер: 225
@Neo-qj2zb3 ай бұрын
This was amazing, please do more demos like this to showcase other things GitButler can do
@alpgirayaykut3 ай бұрын
I am crying with joy and want to kiss you people whoever is responsible!!!❤❤❤
@danielgun19 күн бұрын
really?
@hjewkes3 ай бұрын
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.
@ardonjr3 ай бұрын
This sounds more like a PEBKAC to me but okay..
@dustin63363 ай бұрын
I might be missing something, but couldn’t you have done the exact same thing natively? Such as, stash apply; create branch; stash delete?
@bitti19752 ай бұрын
@@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.
@iflux88213 ай бұрын
Wonderful workflow! ❤
@spittylama3 ай бұрын
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!
@mystica72843 ай бұрын
Love this, especially with feature branch and bugfix, cant wait to try it!!
@ThomasPoth3 ай бұрын
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. ❤❤❤❤❤❤
@gabrieldesouza1123 ай бұрын
We really need this on Windows, guys!
@notcorrect3 ай бұрын
use WSL2
@MustaphaRashiduddin-zx7rn3 ай бұрын
doesnt it work on wsl?
@michaldivismusic2 ай бұрын
Seems like Wondows support is coming soon.
@ftamas8828 күн бұрын
It's out on Windows too now :)
@jimshtepa54233 ай бұрын
amazing presentation and very good product
@TheCoderCoder3 ай бұрын
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!
@inzi273 ай бұрын
github desktop already does the quick undo thing
@issy_dev3 ай бұрын
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!
@miko0073 ай бұрын
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.
@jerbear79523 ай бұрын
This is for a different type of person
@miko0073 ай бұрын
@@jerbear7952 what kind of person would that be? a person that uses git, i would assume...
@b42thomas3 ай бұрын
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.
@ardonjr3 ай бұрын
Subscribed, joined the Discord and all alerts on active. Can't wait to get my hands on this beauty for Windows.
@semihmasat3 ай бұрын
this is actually really usefull. also a really good demo. i will definetely use this. downloading it now.
@freddo1kenobi7133 ай бұрын
Nice work guys, love the demo and the tool, please keep the snot-green background for your conference!
@gsilva8773 ай бұрын
Interesting product and you just get started. I will watch its evolution. Thanks.
@jdhrtl3 ай бұрын
looks very cool, 3:18 is where it all clicked for me. excited to try this out
@atomparish3 ай бұрын
Very nice! Recently stopped using sourcetree to vscode but I miss the GUI. Going to try this out today.
@foobarz-coding3 ай бұрын
good stuff , subscribed and excited to tryout the product
@ImamSyafii-st4ps3 ай бұрын
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
@KarimMaassen3 ай бұрын
Love this so much!
@fuzzy-023 ай бұрын
This feels like it would make version control and such much accessible to non technical people. (Book authors for example)
@soubinan3 ай бұрын
Soooooo promising! For sure I will try it Wondering how it manages conflicts
@JohnJohnson-dl8oq3 ай бұрын
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?
@pallu832 ай бұрын
This was the happy path, what about when the changes conflict?
@bensums3 ай бұрын
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?
@NonLogicalDev3 ай бұрын
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)
@gitbutlerapp3 ай бұрын
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!
@joaobonsegno1263 ай бұрын
I want early access rn! Absolutely amazing
@poweruser64Ай бұрын
5:16 love that cut away at the end! was not expecting that.. what a view! what mountain range is that?
@dsazonoffАй бұрын
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?
@askegg3 ай бұрын
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.
@quintennn3 ай бұрын
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?
@gitbutlerapp3 ай бұрын
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.
@LuveenWadhwani3 ай бұрын
@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?
@CarlosBallena3 ай бұрын
Very curious to see what it does with overlapping changes. This looks great!
@jogdand34103 ай бұрын
Superb!🎉
@josiahayres7373 ай бұрын
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.
@Fr74n3 ай бұрын
This sounds great!
@phpkiller64892 ай бұрын
Amazing cant wait when it hit on windows 💯
@asmaamohamedmagdhelali56103 ай бұрын
Amazing ❤❤
@user-cx6fc4kn7j3 ай бұрын
Seems grate! going to check it out.
@cindrmon3 ай бұрын
thank you so much~
@LuveenWadhwani3 ай бұрын
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.
@HaxxBlaster3 ай бұрын
I was about to say the same, i used it for years
@TwoLeggedTriceratops2 ай бұрын
I was about to say the same. I guess a lot of other products strangely do not have this feature.
@kisaragi-hiu3 ай бұрын
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.
@gitbutlerapp3 ай бұрын
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
@gitbutlerapp3 ай бұрын
Also, the answer is a rolling 2 year window from each commit.
@jkjoker7773 ай бұрын
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
@fahadahmad94343 ай бұрын
this is revolutionary!!
@Croissinate3 ай бұрын
This is incredibly based. I love it
@bohdanpozharskyi2603 ай бұрын
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?
@90DaysOfDevOps3 ай бұрын
Cool stuff. Will give it a go
@ankeshkapil31293 ай бұрын
the question is do i really need a separate product as i like to do all this from my ide
@davidrai213 ай бұрын
It looks good but... what happens if the fix requires changes in the same file that has local modifications?
@ruegen_94433 ай бұрын
You had me at squash
@HashimWarren3 ай бұрын
this looks excellent
@jhawar-ji3 ай бұрын
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
@gitbutlerapp3 ай бұрын
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.
@krsnasameer3 ай бұрын
This is sick aff, but sad its not in windows yet. The tech stack is really mind blowing.
@gitbutlerapp3 ай бұрын
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!
@liamwinterton73703 ай бұрын
@@gitbutlerapp I'd love this to be on windows!!
@giszTube3 ай бұрын
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.
@zekiz7743 ай бұрын
Yooo, thats so cool. Will try this
@ashutoshmishra62073 ай бұрын
Are these functionalities GUI only? Or is there some way to expose the gitbutler API for CLI use as well?
@reed65143 ай бұрын
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)
@gitbutlerapp3 ай бұрын
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.
@jinushaun3 ай бұрын
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!
@ishantsehrawat17123 ай бұрын
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❤
@elviskrstulovic3 ай бұрын
Looks quite intereesting ... will be playing with it soon
@1234minecraft56783 ай бұрын
Git buttler does not integrate with other tools around the git workflow by any chance? Like with pre-commit?
@gitbutlerapp3 ай бұрын
We do execute some git hooks like pre and post commit, but not all of them yet. You can turn it on in your settings.
@berndeckenfels3 ай бұрын
Do you also auto fetch the repos or is it more a „pre-fetch“ only?
@gitbutlerapp3 ай бұрын
We actually auto-fetch them and update the refs/remotes references.
@berndeckenfels3 ай бұрын
@@gitbutlerapp yeah ,)
@GeraldScholz3 ай бұрын
Nice, hope you add azure support!
@MrAzulay2 ай бұрын
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.
@LegionLeague3 ай бұрын
I am impressed. Waiting for Windows version to try out.
@gitbutlerapp3 ай бұрын
We are working on it, but git2/openssl on Windows is being a little bit of a pain. Soon!
@Tidbit01233 ай бұрын
@@gitbutlerapp Cant wait! Is there somewhere I can subscribe to get email updates on this?
@cmdeckermusic3 ай бұрын
Nice, I like it. I’d love it more with a NeoVim plugin, where you can do mouseless switching and toggling of virtual branches.
@gitbutlerapp3 ай бұрын
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.
@Beryesa.3 ай бұрын
That seems to have some potential 👀
@pavellaptev29933 ай бұрын
Hooray 🙌 🚀
@TheTivec3 ай бұрын
Can’t wait for a windows version, hope it isn’t too far out!
@gitbutlerapp3 ай бұрын
Working on it!
@stefanhenrico3 ай бұрын
Really cool!
@antoniothomacelli3 ай бұрын
Nice tool!
@gitbutlerapp3 ай бұрын
Thanks!
@harudot3 ай бұрын
すばらしいです!ありがとう
@carlosricardoziegler26503 ай бұрын
Amazing :)
@husamui3 ай бұрын
Exciting product! ♥
@rajat06103 ай бұрын
super cool!
@seebradrun3 ай бұрын
This is awesome
@gitbutlerapp3 ай бұрын
Thanks! We think you're awesome too.
@VerifiedNobody3 ай бұрын
Will it work with non github instances for pull request and stuff?
@gitbutlerapp3 ай бұрын
It will not right now. We will eventually implement GitLab as well, but it's not yet started.
@isweartofuckinggod3 ай бұрын
Awesome!
@danielduvana3 ай бұрын
You should put links to your stuff in the video description and in the channel description
@VarunGupta30093 ай бұрын
Welp, let's see how this goes! 🚀🚀🚀
@soyhenryxyz3 ай бұрын
are there plans to integrate this into vscode/cursor IDE?
@gitbutlerapp3 ай бұрын
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.
@yurisich3 ай бұрын
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.
@gitbutlerapp3 ай бұрын
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.
@SagiYou3 ай бұрын
This seems more suitable for web based development. How about C or C++ project which needs to compile to take effect?
@staaky3 ай бұрын
Awesome, need it as a vscode extension
@gitbutlerapp3 ай бұрын
We would love to do this someday.
@okunamayanad3 ай бұрын
i'm installing gitbutler
@TheEvilKittenLord3 ай бұрын
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
@gitbutlerapp3 ай бұрын
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. :)
@Komeuppance3 ай бұрын
How about us snaggletooths?
@MrNitrocification3 ай бұрын
when is the windows support?
@ivanjermakov3 ай бұрын
This is exactly the workflow I have with IntelliJ's changelists. Not sure if another tool worth the learning effort.
@gitbutlerapp3 ай бұрын
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.
@fuzzy-023 ай бұрын
I dound the gui really appealing
@human4566vv3 ай бұрын
Real people never leave terminal, stupid whine about ui
@brunocmesquita3 ай бұрын
Any plans for support to Bitbucket?
@spacegamedevsoftware3 ай бұрын
This looks awesome! Can't wait till it comes to Windows.
@gitbutlerapp3 ай бұрын
Us too. Working on it.
@marc-io3 ай бұрын
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? 😅
@kpsher3673 ай бұрын
Is it in RC ?
@ivanmeen7422 ай бұрын
Good intro
@dominik34823 ай бұрын
Loved it on my mac. Unfortunately, we use Windows at work. I really hope that a windows release comes soon!
@gitbutlerapp3 ай бұрын
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.
@dgs19773 ай бұрын
maybe i dont quite get it - but isnt this kind of close to git worktree?
@Stanzilla3 ай бұрын
Would love to see a comparison with Graphite!
@gitbutlerapp3 ай бұрын
The simple version is that Graphite seems to advocate stacked branches whereas we try to facilitate parallel branches so they are not dependent.
@169821613 ай бұрын
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
@gitbutlerapp3 ай бұрын
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. :)
@notproplayer36493 ай бұрын
@gitbutlerapp will there be Linux support ?
@gitbutlerapp3 ай бұрын
@@notproplayer3649 We have AppImage and deb builds for Linux. You can download them directly from the home page.
@notproplayer36493 ай бұрын
@@gitbutlerapp I totally missed it, thanks !
@monochromeart73113 ай бұрын
@@gitbutlerapp why not distribute it as a flatpak?
@hansmuster52913 ай бұрын
dope location, dope product but how do you plan to monetize it?
@gitbutlerapp3 ай бұрын
Our plan is to have the GitButler client be free and open. We are working on optional server-based features that we plan to monetize for code review, sharing, team collaboration, etc.