Added branch/b alias + merge options
This commit is contained in:
parent
3f1787fc84
commit
94ef8b5786
1 changed files with 5 additions and 0 deletions
|
@ -14,7 +14,12 @@
|
|||
[diff]
|
||||
colorMoved = zebra
|
||||
[alias]
|
||||
b = branch
|
||||
c = commit
|
||||
chk = checkout
|
||||
l = log
|
||||
s = status
|
||||
[merge]
|
||||
ff = no
|
||||
commit = no
|
||||
conflictstyle = diff3
|
||||
|
|
Loading…
Reference in a new issue