dada


git

My ~/.gitconfig looks as follows:

[user]
	name = yourname
	email = youremail
[color]
	status = auto
	diff = auto
	branch = auto
[core]
	editor = vim
[diff]
	tool = vimdiff
[diff "vimdiff"]
	cmd = vimdiff \"$LOCAL\" \"$REMOTE\"
[merge]
	tool = vimdiff
[merge "vimdiff"]
	cmd = vimdiff \"$LOCAL\" \"$REMOTE\"
[push]
	default = simple

handy links

official git guide

setting up a server