ninewise/configuration
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Specify upstream in ff

Browse source
This commit is contained in:
Felix Van der Jeugt 2020-08-20 15:51:39 +02:00
parent a93d6b56ba
commit 1a1895d658
No known key found for this signature in database
GPG key ID: 58B209295023754D
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gitconfig
View file

@ -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