aliased merge to merge --no-ff

majuscule · Jan 8, 2011 · cb56fa2 · cb56fa2
1 parent 7e0de91
commit cb56fa2
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitconfig b/.gitconfig
@@ -6,3 +6,4 @@
 	email = dylan@psu.edu
 [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
+	merge =  merge --no-ff