From 33b0018457db0bd965b906d6fc2963a1f7facedc Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 16 Jul 2009 21:02:37 +0000
Subject: update gitconfig and add to link-them

git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@404 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede
---
 gitconfig | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'gitconfig')

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
-- 
cgit v1.2.3