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]
|
[diff]
|
||||||
colorMoved = zebra
|
colorMoved = zebra
|
||||||
[alias]
|
[alias]
|
||||||
|
b = branch
|
||||||
c = commit
|
c = commit
|
||||||
chk = checkout
|
chk = checkout
|
||||||
l = log
|
l = log
|
||||||
s = status
|
s = status
|
||||||
|
[merge]
|
||||||
|
ff = no
|
||||||
|
commit = no
|
||||||
|
conflictstyle = diff3
|
||||||
|
|
Loading…
Reference in a new issue