update gpull to use --ff-only flag

2026-01-28 09:59:54 -06:00 · 2014-03-20 10:04:59 -05:00
parent 689bc2b302
commit cfc738c67c
1 changed files with 1 additions and 1 deletions
--- a/bash/aliases
+++ b/bash/aliases
@@ -11,7 +11,7 @@ alias gaa='git add .'
 alias gco='git checkout'
 alias gc='git commit'
 alias gpush='git push'
-alias gpull='git pull'
+alias gpull='git pull --ff-only'
 alias gfetch='git fetch'
 alias gdiff='git diff'
 alias merged?='git branch --merged'