MainelyDesign.com Blog

Using KDiff3 as Git GUI Merge Tool on Windows XP and Windows 7

Posted on 09/23/2010 at 01:39 pm | Viewed 11,510 times | 0 comments

I've been looking for the silver bullet solution to using KDiff3 as my git mergetool on Windows (using Git GUI).  I've finally got a solution that works in every Windows environment I've tried:

1. Add the KDiff3 directory to your Windows System Path (e.g. C:\Program Files\KDiff3\)
2. Add kdiff3 as your Git mergetool (From Git Bash, run git config --global merge.tool kdiff3)
3. Add kdiff3 complete path to Git Config (From Git Bash, run git config --global meregtool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe")
4. Go into Git GUI settings and set the mergetool to kdiff3 (if Git GUI doesn't pick up this setting from git config, which it should)

Read: Using KDiff3 as Git GUI Merge Tool on Windows XP and Windows 7 | View: Comments

Weird Git Error After Upgrade: Repository not found. Make sure you include the .git

Posted on 02/02/2010 at 08:18 am | Viewed 4,713 times | 0 comments

This isn't a weird error in that I've never seen it (ususally when I forget to load up Pagaent before attempting Github push/pulls).  It's weird because everything was working perfectly and then I couldn't do anything from remote!  I upgraded msysgit recently and hadn't tried to do any remote commands until yesterday.  And I kept getting the following error in Git Gui:

Read: Weird Git Error After Upgrade: Repository not found. Make sure you include the .git | View: Comments

Using Git and Plink for SSH on Windows

Posted on 01/25/2010 at 11:11 am | Viewed 6,802 times | 0 comments

Well, I finally had an opportunity to install Git on Windows yet again.  It had been quite a while since my last time installing Git on Windows, so I was a little rusty and couldn't figure out how to get Git to use Plink for SSH.  It's actually quite simple and dependent on a Windows system variable.

Getting Git to use Plink for SSH on Windows

Read: Using Git and Plink for SSH on Windows | View: Comments

Keep Old Settings When Upgrading Eclipse

Posted on 05/12/2009 at 01:02 pm | Viewed 1,761 times | 0 comments

I decided to upgrade my version of Eclipse to 3.4 (Ganymede) mainly so I could use the Git plugin.  I wanted to migrate my settings from one install to the other.  I know I had done this before, when I upgraded from 3.2 to 3.3, but forgot how.  So I don't have to scratch my head so much next time, here is how you can move your settings after you upgrade your version of Eclipse.

Read: Keep Old Settings When Upgrading Eclipse | View: Comments

Avoiding New Line Errors using Git on Windows

Posted on 05/12/2009 at 12:27 pm | Viewed 1,902 times | 0 comments

I'm finally working on moving my code over to a version control system.  I've tried several times over the past few years to start using Subversion, but I never quite got into it.  After hearing so much about Git, I decided I needed to start using it.  Luckily, most people tell you to forget everything about Subversion when using Git- no problem there!

Read: Avoiding New Line Errors using Git on Windows | View: Comments