From 9d4659ca3f44e203dd0f9f8d8847cc073d4993ec Mon Sep 17 00:00:00 2001
From: Artem Sapegin <artem@sapegin.ru>
Date: Tue, 29 Oct 2013 13:04:26 +0400
Subject: [PATCH] Git: commerge alias, merge options.

1. commerge: commit resolved conflict without editing message.
2. Do not open editor on successfull merge.
---
 tilde/gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tilde/gitconfig b/tilde/gitconfig
index 709a9db..aad48c5 100644
--- a/tilde/gitconfig
+++ b/tilde/gitconfig
@@ -12,6 +12,7 @@
 	pager = less -r
 	autocrlf = false
 	safecrlf = false
+	mergeoptions = --no-edit
 	excludesfile = ~/.gitignore
 [alias]
 	a = add
@@ -27,6 +28,7 @@
 	l = log --graph --pretty=format:'%C(magenta)%h%C(blue)%d%Creset %s %C(blue bold)- %an, %ar%Creset'
 	ll = log --stat --abbrev-commit
 	conflicts = diff --name-only --diff-filter=U
+	commerge = commit --no-edit
 [push]
 	default = current