Is git good?

Git good

no but we just have to live with it

Yes.

>>60032440
It's only good because there's nothing better.

>>60032570
I haven't used it much, what could be improved?

>>60032593
Most of the way the commands work. For example, add -p is really a subclass of commit, not add. Merge and add -p do not make it clear whether or not you should commit on top of them. If you don't commit at the end of a merge (which mergetool should do but doesn't do), you will add future changes to the merge which will cause problems with history. If you commit after an add -p, you will undo the add -p.

Additionally, merge as a whole is fucked. Just using a standard workflow of git commit -a; git pull; git mergetool; git commit -a; git push; often results in completely unexplainable blame overwrites. Also, vimdiff is the default mergetool method but it's completely borked (it will randomly select a subset or a superset of the remote or local instead of the right segment when using the appropriate command).

Other problems include cherrypick which also has interface problems (if you keep cherrypicking until it says everything is good, it will just give you an empty commit, I haven't figured that one out yet).

Yes although merging is a bit iffy.

If you can you should avoid working on the same things in different branches simultaneously anyways.