improve git pull behaviour

11 years ago · f52a7bd9b2
parent 6b87c98fb3
commit f52a7bd9b2
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -5,7 +5,7 @@
    ci = commit
    co = checkout
    a = add
-    p = pull --rebase
+    p = pull --ff-only
    s = status -sb
    lv = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
    lg = log --graph --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative