Installing Kdiff3 version control mergetool for Git

kdiff3 is a great GUI mergetool for git. However the installation is more tedious in Windows compared to Linux. Below is instruction on how to install it in Windows.

Download and install program:
http://sourceforge.net/projects/kdiff3/

Add kdiff3 as your Git mergetool
From Git Bash, run
$ git config --global merge.tool kdiff3

Open the file repository/.git/config
and paste the code below

[merge]
    tool = kdiff3
[mergetool "kdiff3"]
    path = C:/Program Files/KDiff3/kdiff3.exe
    keepBackup = false
    trustExitCode = false

tags:
git mergetool kdiff3 windows
kdiff3 mergetool is not available
better than vimdiff

Using git with restricted server/godaddy

You cannot install git on your godaddy hosting server. The alternative would be to connect godaddy server to your computer that already has git installed. What we will be doing is mounting the server folder to a folder on your computer using sshfs. This enables you to run programs installed on your computer for remote servers. (I'm using Ubuntu 11.10)

$ sudo apt-get install sshfs
#$ sshfs hostDirectory computerDirectory
$ sshfs username@hostname:/ ~/Desktop/mount
$ cd mount

# to unmount
$ sudo umount /path #its umount not unmount command


reference:
http://www.howtogeek.com/howto/ubuntu/how-to-mount-a-remote-folder-using-ssh-on-ubuntu/

Set up a Custom Git Remote Server like GitHub

In the server:
# have ssh installed on your server
$ sudo apt-get install openssh-server

# install git on both local and server machine
sudo apt-get install git

# navigate inside the folder you want to contain the repository
# create a new repository
$ git init

In local machine:
# navigate inside the folder you want to contain the repository
# create a new repository
$ git init

# set the origin
$ git remote add origin ssh://michael@192.168.0.175/GitServerFolderCreatedLocation

# update the server
# when pushing to the server make sure your not in the branch your pushing to
# you may need to fetch and merge (pull) before you can push
$ git push origin --all          #or $ git push origin [branch Name]

# update the local machine, get data from server
$ git fetch origin [branch Name]

Git Introduction Video

Awesome video explaining how Git (version control system) works and how to use it. Scott Chacon Evangelist & Ruby Developer from GitHub does a great job using images, graphs and demos to help illustrate.




Reference Site: gitref.org

Tags:
alternative to subversion

Learning Git

Git allows you to work on your code with the peace of mind that everything you do is reversible. It makes it easy to experiment with new ideas in a project and not worry about breaking anything.

Resources:
nettus.com
gitcasts.com
Git Magic