git: added ffpull alias

diff --git a/.gitconfig b/.gitconfig
index 1f0cafa9d4b864e84480ec2e39231d4ce18f6362..87680ab12ae168caf25c30da7d055aa47ea48666 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -8,6 +8,8 @@
        editor = vim
 [log]
        decorate = full
+[push]
+       default = upstream
 [alias]
        graphlog = log --graph --pretty=format:'%C(bold black)%h%Creset %C(bold red)%ad %C(bold blue)%s%Creset %C(bold yellow)%d%Creset %C(bold black)<%an>%Creset' --date=short
        ci = commit
@@ -18,5 +20,4 @@
        dic = diff --cached
        dicw = diff --cached --color-words
        ff = merge --ff-only
-[push]
-       default = upstream
+       ffpull = pull --ff-only