News for hackers. Stuff that matters.
Re:Fork: A fast and friendly Git client for Mac and Windows by jlis on Wednesday July 24, 2019 @02:37AM (#20512821)
I use Fork on work and also private. Great software. One of the main reasons to switch is the merge/conflict view, which is, at least in my opinion, one of the best out there.

Previously I've used Sourcetree and SmartGit, and even some Git integration in PHPStorm/WebStorm. But for now, Fork is just lit.

If I could I just wish for one thing: mark branches which are only local and have no remote, so you can easily purge old branches after they're merged.

Re:Fork: A fast and friendly Git client for Mac and Windows by jmiserez on Wednesday July 24, 2019 @03:00AM (#20512912)
>mark branches which are only local and have no remote, so you can easily purge old branches after they're merged.

  git fetch --prune
EDIT: Then you can see which ones don't exist on the remote

  git branch -v
which will show [gone] if it's a tracked branch but the corresponding upstream branch isn't there anymore. Use -vv to show the upstream branch names as well.

See:

- https://git-scm.com/docs/git-fetch#_pruning

- https://git-scm.com/docs/git-fetch

Re:Fork: A fast and friendly Git client for Mac and Windows by uasi on Wednesday July 24, 2019 @03:06AM (#20512933)
git fetch --prune removes stale remote-tracking references, not local branches.
Re:Fork: A fast and friendly Git client for Mac and Windows by jmiserez on Wednesday July 24, 2019 @04:14AM (#20513183)
You are right. I've updated my comment above and added a second step which shows which branches can be removed.
Re:Fork: A fast and friendly Git client for Mac and Windows by Bootwizard on Wednesday July 24, 2019 @03:22AM (#20512996)
Better than BeyondCompare?