undefined | Better HN

0 pointsshp0ngle2y ago0 comments

GitButler will literally not work when you use raw git, or other tools.

0 comments

But even if you do run “checkout” or “commit”, we still notice that you did that and try to put you in the state you want.

schacon2y ago

It works fine. The only thing that is a problem is “branch” and “commit”, things that use the index. But that makes sense. If you have setup two virtual branches and then from the cli run “git commit”, which branch do we commit to?

trws2y ago

This makes sense, but I have to say I would find it much less concerning if doing "commit" would apply to some well-defined selection. Either something marked in the UI as "default" or "first" or something so that normal git operations wouldn't cause failure. I realize it makes one of the virtuals special, which is unfortunate, but it means normal command line workflows would be _safe_ even if they wouldn't always provide all the options.

schacon2y ago

Two things. One is there is a commit dialog per virtual branch. You do a commit on a branch. The selection is all the files/hunks you see on that branch, or you can selectively commit parts of those changes (such as a add -i type commit). It's pretty much identical to how Git (or any other Git GUI) handles commit selection, except you can have more than one branch that you're working with, applied, at a time.

Also, GitButler, as far as I can think of, never causes normal git operations to fail. It doesn't put the project git repo in a state where git can't operate.

1 more reply

OJFord2y ago

If it were implemented as a 'rebased chain' as I described rather than a multi-head merge: the active one, just as vanilla `git commit` would.

alexeiz2y ago

> The only thing that is a problem is “branch” and “commit”, things that use the index.

A git branching tool that breaks git branch and commit - what a novel concept!

j / k navigate · click thread line to collapse

0 comments

schacon2y ago

But even if you do run “checkout” or “commit”, we still notice that you did that and try to put you in the state you want.

schacon2y ago

trws2y ago

schacon2y ago

Also, GitButler, as far as I can think of, never causes normal git operations to fail. It doesn't put the project git repo in a state where git can't operate.

1 more reply

OJFord2y ago

If it were implemented as a 'rebased chain' as I described rather than a multi-head merge: the active one, just as vanilla `git commit` would.

alexeiz2y ago

> The only thing that is a problem is “branch” and “commit”, things that use the index.

A git branching tool that breaks git branch and commit - what a novel concept!

j / k navigate · click thread line to collapse