jjkiers/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Git: commerge alias, merge options.

Browse Source 
1. commerge: commit resolved conflict without editing message.
2. Do not open editor on successfull merge.
This commit is contained in:
Artem Sapegin 2013-10-29 13:04:26 +04:00
parent 5883f46330
commit 9d4659ca3f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tilde/gitconfig
View File

@ -12,6 +12,7 @@
pager = less -r pager = less -r
autocrlf = false autocrlf = false
safecrlf = false safecrlf = false
mergeoptions = --no-edit
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
[alias] [alias]
a = add 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' l = log --graph --pretty=format:'%C(magenta)%h%C(blue)%d%Creset %s %C(blue bold)- %an, %ar%Creset'
ll = log --stat --abbrev-commit ll = log --stat --abbrev-commit
conflicts = diff --name-only --diff-filter=U conflicts = diff --name-only --diff-filter=U
commerge = commit --no-edit
[push] [push]
default = current default = current