FRESH

Hacker News

Show HN: Effective Git

35 points by nola-a

by tomtom1337

1 subcomments

I'd recommend using git switch instead of checkout, since the checkout command is so overloaded. And restore instead of checkout for restoring changes.

by ralferoo

0 subcomment

After using git for about 15 years, I still find "git merge" unpleasant and hard to track changes. I've always had better experiences rebasing my branch on top of the current main and then committing the resultant changes. Of course it helps if you are regularly rebasing from main rather than leaving it until the end, but the process still usually feels cleaner than with git merge.
The only downside of rebasing (for me) is it looks confusing when commits aren't sequentially in date order, and sometimes it feels like you need to resolve the same conflict several times (once for each commit that gets rebased if they touch the same code) but that usually works out better for me than a regular merge.

by eviks

0 subcomment

> This document wants to be a reference for best practices in the daily use of Git
Then it wouldn't stick to the most ineffective interface for git - cli

by Valodim

1 subcomments

Eh. If you're interested in sharpening your vcs toolchain, just learn jj already