commit 9fbb9c8af98367e22667cf6f44268032c4a92641 parent dfebb5da4b76381f3e3957dc4485c001a633c632 Author: Anders Damsgaard <anders.damsgaard@geo.au.dk> Date: Fri, 3 Jul 2015 20:39:28 +0200 do not rebase during pull Diffstat:
M | bin/uu | | | 2 | +- |
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/uu b/bin/uu @@ -19,5 +19,5 @@ fi # Spacemacs cd ~/.emacs.d && \ -git pull --rebase && \ +git pull && \ #--rebase && \ git submodule sync; git submodule update