Git: commerge alias, merge options.
1. commerge: commit resolved conflict without editing message. 2. Do not open editor on successfull merge.
This commit is contained in:
parent
5883f46330
commit
9d4659ca3f
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user