Skip to content

Commit 8d987ee

Browse files
committed
Add merge.edit=false config and gmne alias for no-edit merges
1 parent 6e0a506 commit 8d987ee

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

.gitconfig.base

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
prompt = false
2929
[merge]
3030
conflictStyle = diff3
31+
edit = false
3132
[mergetool]
3233
prompt = false
3334
keepBackup = false

.zshrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ alias gls='git log --show-signature'
201201
alias gm='git merge'
202202
alias gmm='git merge --no-edit main'
203203
alias gmnc='git merge --no-commit'
204+
alias gmne='git merge --no-edit'
204205
alias gmom='git merge --no-edit origin/main'
205206
alias gmt='git mergetool'
206207
alias gn='git newb'

0 commit comments

Comments
 (0)