update gitconfig and add to link-them

git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@404 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede

2 files changed, 6 insertions, 1 deletions

diff --git a/Link-Them b/Link-Them
index 7cd10a8..8fdfac7 100755
--- a/Link-Them
+++ b/Link-Them
@@ -12,7 +12,7 @@ else
 	relpath="${dir##$HOME/}/"
 fi
 
-for file in bash_profile bashrc screenrc vimrc zshrc zshfunc; do
+for file in bash_profile bashrc gitconfig screenrc vimrc zshrc zshfunc; do
 	if [ -L "$HOME/.$file" ]; then
 		if [ "$(readlink "$HOME/.$file")" = "$dir/$file" ]; then # old style symlink, remove
 			rm -v -f "$HOME/.$file"
diff --git a/gitconfig b/gitconfig
index b7d11d3..10f6efc 100644
--- a/gitconfig
+++ b/gitconfig
@@ -4,6 +4,7 @@
 [alias]
 	st = status
 	ci = commit
+	co = checkout
 [color]
 	diff = auto
 	status = auto
@@ -12,3 +13,7 @@
 	sslCAPath = /etc/ssl/certs
 [merge]
 	summary = true
+[branch "debian-merge"]
+	mergeoptions = --no-ff --no-commit
+[branch "debian"]
+	mergeoptions = --no-ff --no-commit