• Remove git submodule created by mistake

    Make sure that the sub-directory/sub-module doesn't have .git directory. If it does, delete the .git directory inside the sub-directory/sub-module rm -rf [sub-module]/.git   Clear the git cache git rm --cached [sub-module]  
    0Read more
  • Guide to configure KDiff3 as git merge tool and diff tool (Mac)

    This is a simple guide to configure your git merge tool and diff tool to use KDiff3. Install KDiff3 Configure Git Execute in terminal git config --add merge.tool kdiff3 git config --add mergetool.kdiff3.path /Applications/ git config --add mergetool.kdiff3.trustExitCode false git config --add diff.guitool kdiff3 git config --add difftool.kdiff3.path /Applications/ git config --add difftool.kdiff3.trustExitCode false