Author: Kyle Fuller <kyle@fuller.li> 2021-04-03 18:23:22 +0100 +0100
Committer: Kyle Fuller <kyle@fuller.li> 2021-04-03 18:23:22 +0100 +0100
Commit: d9782e96532362868673a375260964e69040b6d7
Parent: f4ba9db16ef5bbac41579189f3674ac69213b401
feat(git): pull as fast forward only
diff --git a/.gitconfig b/.gitconfig
index 39963a18067fc35441fd17f58bba06c817ea19d0..1700fd1a94624ae306705d9ebf44b4d6896f0ba8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -18,6 +18,9 @@ l = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
standup = !clear && git log --since '1 day ago' --no-merges --pretty=format':%C(yellow)%h %aN%n %B%n' --author 'Kyle Fuller'
conflict = "!f() { git status -s | grep ^UU | awk '{print $2}' ; }; vim `f`"
+[pull]
+ ff = only
+
[push]
default = current