Git Fork
Git Fork is "a fast and friendly git client for Mac and Windows".
Before I start I just wanted to say. I'm not affiliated ...
For further actions, you may consider blocking this person and/or reporting abuse
My favorite git client is the command-line one
tig
. Very lightweight, I mainly use it to select the specific chunks of a file I want to commit, and since it's a console tool, it does not disrupt my terminal/neovim workflow: github.com/jonas/tigFork is my current fav too when I want to use a GUI. I used to be a big fan of GitKraken, particularly for it's beautiful interface and merge tool. However, once they started charging to use it with a non-GitHub repo, I knew it was time to find an alternative. After trying 5 or 6, Fork was the clear winner.
The only thing I miss from GitKraken is the built-in conflict resolution tool. I use P4Merge now, and am happy with it. While it is more powerful, it does lacks the simplicity and nice design of GitKraken's. With any luck, I'll figure out how to unlock Fork's!
However, I saw that your screenshot shows an internal merge tool! I swear I've clicked the Merge button (which no longer says 'beta') before and was just given the default textual git merge with the comments. After seeing this post, I just tried it again, and I'll be damned if it didn't provide a nice merge tool! I'm thrilled. Thank you so much!
Can’t agree more. Yeah the built in merge tool is new it’s not as nice as GitKrakens. Since I do a lot of web development I use Visual Studio Code for the merge conflict resolver. I found that to work the best for me.
My favorites are
gitk
when a UI is available andtig
otherwise. Sure,fork
looks nicer, butgitk
is much faster to start, and I find it's display to be more understandable, not sure exactly why. The main problem being that on most recent versions of macOS, it crashes withinwish
, so it's usuallyfork
(for complex repos) ortig
(for speed) anyway.They are about start charging $49.99 very soon. Details pricing and features not yet released so not sure
I just saw that too. I hope they won't do the same of gitkraken.
The $49.99 is a one time fee at least, and it's free for evaluation. So that's still a plus over GitKraken's yearly subscription pricing model for me.
While Fork is cool keep in mind is not open-source. Based on previous experience with more than a dozen of git gui clients, anything not open-source will only become more expensive with time. I would gladly sponsor it if it was an open-source and even contribute with fixes. Meanwhile SourceTree is open but it lacks behind, especially as Atlassian did not spend much effort on it after they acquired it.
This post was written almost 2 years ago. I use the built in git from VSCode now. At least for me it does everything I need it to and I don’t have to leave my code editor.
SourceTree was the first Git GUI I used but it was very buggy and slow for me.
As far as Fork becoming more expensive, sure everything does. Fork used to be free the only reason they made people pay for it was because so many people were telling them they should make people pay for it. At least it will help support them. It’s only a man and his wife making it. This was before GitHub sponsers came out.
I am just starting to using it. and How can I open it from the terminal ?
If you're using a mac you can type
open -a fork
No. Fork > Preferences > Integration > Command Line > Install CLI Tool.
Then, $fork .
Cool good to know. For me I had to type
fork
instead of$fork
on mac.