Earlier quoted context omitted.
> 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 - h…
git fetch --prune removes stale remote-tracking references, not local branches.
Fork: A fast and friendly Git client for Mac and Windows
51–60 of 173 posts
Re: Fork: A fast and friendly Git client for Mac and Windows
#52The license prohibits all kinds of things so I am not comfortable using it: https://fork.dev/license Specifically, it says: * "You will not use this Software to engage in or allow others to engage in any illegal activity.": Which jurisdiction? how far do I have to go to prevent illegal activity? * "You will not engage in using this Software that will interfere with or damage the operation of the services of any third…
Though, this license is pretty much radioactive for me: "You will not, and will not permit others to reverse engineer, decompile, disassemble, derive the source code of, modify, or create derivative works from this Software..."
Fair enough if you want to use whatever license you want to use, but definitely a "no thanks" from me...
Re: Fork: A fast and friendly Git client for Mac and Windows
#53For Mac users, nothing beats GitUp[0] 0: https://gitup.co
Re: Fork: A fast and friendly Git client for Mac and Windows
#54The license prohibits all kinds of things so I am not comfortable using it: https://fork.dev/license Specifically, it says: * "You will not use this Software to engage in or allow others to engage in any illegal activity.": Which jurisdiction? how far do I have to go to prevent illegal activity? * "You will not engage in using this Software that will interfere with or damage the operation of the services of any third…
Re: Fork: A fast and friendly Git client for Mac and Windows
#55Re: Fork: A fast and friendly Git client for Mac and Windows
#56It really does look amazing, which is probably why I wonder how it can be free.
Re: Fork: A fast and friendly Git client for Mac and Windows
#57As someone pretty comfortable with got on the command line, what advantages would a GUI give me? I’m not trolling, it’s an honest question. Anyone with good got command line skills move to something like this and find it offers them a better workflow?
i mostly use the git cli. i even like it; despite some ux problems! i've often been the one teaching git, and always make sure junior hires learn at least a little bit of git cli. but i do use a few extra interfaces. 1. complex staging operations. i do a lot of partial staging. staging by line or hunk is good enough most of the time. sometimes though i want a little more. maybe only part of a line, or parts of multip…
Re: Fork: A fast and friendly Git client for Mac and Windows
#58Earlier quoted context omitted.
Basically, in GUIs the most common commands are represented in UI, and some combined into a single action. Also, visually viewing the entire tree (not sure the name for the entire branching structure) can be helpful to debugging and fixing issues caused by merging, accidental overwrites, etc. The disadvantages are: - cherry picking commits is not easy - lacks advanced (read uncommon) commands - sometimes git errors a…
> visually viewing the entire tree [branching structure] You can do that with git CLI no problem, it's one of my most used aliases (so I can't recall exactly the underlying command) - just flags to log. --pretty=oneline --all --decorate is the key bit iirc. While I'm at it, my hands down most used alias is 'fixup', which takes a ref, commits with message 'fixup! ' and rebases with whatever flag makes it turn that int…
The one option I really like is --first-parent. If you did merge commits for every new feature, and gave sensible names to those commits (instead of "Merge A into master", use "Merge awesome feature"), it really simplifies the git history and makes it easy to grasp the dev history.
Now, on command-line vs GUI, I think the contrary is actually true: once you know your way around some piece of software, small operations are easier using CLI. However, I really appreciate GUIs to set-up the most complex ones, or the fairly complex, but rarely used ones. And of course, GUIs tend to help you discover stuff while you're still learning the software, though git CLI does that pretty well too.
[1]: https://stackoverflow.com/questions/1057564/pretty-git-branc...
Re: Fork: A fast and friendly Git client for Mac and Windows
#59The license prohibits all kinds of things so I am not comfortable using it: https://fork.dev/license Specifically, it says: * "You will not use this Software to engage in or allow others to engage in any illegal activity.": Which jurisdiction? how far do I have to go to prevent illegal activity? * "You will not engage in using this Software that will interfere with or damage the operation of the services of any third…
Re: Fork: A fast and friendly Git client for Mac and Windows
#60Not my work, but this is one of the most impressive Git clients I've extensively used — and it's free. Tons of features, lots of thought put into usability, and fully native. If this were a $50 product, I'd happily pay it, but there's not even a donation link. Just wanted to share!