User Tools

Site Tools


kb:bestpractices:scc:fork

13 Fork Setup

Here at HSE, we all agree that Git Fork is our preferred graphical git client. It is developed and maintained by two very responsive developers who are making a living providing this fantastic tool. With its robustness, feature completeness and ease of use, it is worth every single cent!

You can download it at https://git-fork.com


SSH Setup

See SSH.


Version of Git

Fork ships its internal git version. If you have installed a separate instance of git, make sure to have the same version installed to prevent confusion.

See this issue for more information about using only one instance.

You may want to use git update-git-for-windows.


Gitflow

Gitflow is a local per-repository setting and must be enabled every time a repository is cloned to a new location.

Git Fork comes with UI support for gitflow (ie there are menu items that make it super simple to use gitflow in your daily work). To enable gitflow from within Fork, go to the Repository menu item and select Git Flow → Enable Git Flow…/


LV Compare

To use LV Compare in Git Fork, adjust the settings under File → Preferences → Integration → External Diff Tool. Configure these values:

Diff Tool Custom
Diff Tool Path see below
Arguments “$REMOTE” “$LOCAL” -nobdpos -nobdcosm

You can find information on setting up LVCompare as well as the proper values for Diff Tool Path in the “SCC” section of our LV Compare wiki page.


GitK

Integrating gitk (The Git repository browser) into fork can be useful e.g. to check if a file has been modified on another branch to be aware of possible merge conflicts even before they arise. Execute a git fetch –all before, to see all changes.

Create a Custom Command (File → Preferences) with Target File Edit Path and Parameter to

 $sh
 "C:\Program Files\Git\mingw64\bin\gitk" --all "$filepath"

kb/bestpractices/scc/fork.txt · Last modified: 2025/07/09 15:06 by joerg.hampel