1 files changed, 5 insertions, 0 deletions
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