Specify upstream in ff
This commit is contained in:
parent
a93d6b56ba
commit
1a1895d658
@ -18,7 +18,7 @@
|
||||
[alias]
|
||||
pf = push --force-with-lease
|
||||
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
|
||||
ff = merge --ff-only
|
||||
ff = merge --ff-only @{upstream}
|
||||
co = checkout
|
||||
jn = merge --no-ff --log --edit
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user