My gitconfig for projects that use git-svn

.gitconfig

[core]
	editor = notepad++.exe
	whitespace = nowarn
[alias]
	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
[user]
	name = myname
	email = [email protected]
[merge]
	tool = diffmerge
[mergetool "diffmerge"]
	cmd = \"c:/scripts/diffmerge-merge.sh\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
	trustExitCode = false
	keepBackup = false
[diff]
	tool = diffmerge
	external = c:/scripts/diffmerge-diff.sh
[mergetool]
	keepBackup = false
[alias]
	up = !git svn fetch && git svn rebase -l && git push . remotes/git-svn:master
	dci = !git svn dcommit && git push . remotes/git-svn:master

diffmerege-merge.sh

#!/bin/sh

localPath="$2"
basePath="$1"
remotePath="$3"
resultPath="$4"

if [ ! -f $basePath ]
then
    basePath="c:/scripts/diffmerge-empty"
fi

"C:/Program Files/SourceGear/DiffMerge/DiffMerge.exe" --merge --result="$resultPath" "$localPath" "$basePath" "$remotePath" --title1="Mine" --title2="Merged: $4" --title3="Theirs"

diffmerge-diff.sh

#!/bin/sh

path="$1"
old="$2"
new="$5"

"C:/Program Files/SourceGear/DiffMerge/DiffMerge.exe" "$old" "$new" --title1="Old" --title2="New $path"