From 611bc73f052e63723b09b2ebb6e7b794774b8984 Mon Sep 17 00:00:00 2001 From: ELR Date: Fri, 4 Aug 2023 22:54:18 +0200 Subject: [PATCH] =?UTF-8?q?A=C3=B1adir=20estrategia=20por=20defecto=20en?= =?UTF-8?q?=20git=20pull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 3898f5a..e83bf28 100755 --- a/update.sh +++ b/update.sh @@ -15,7 +15,7 @@ then fi # Descargar cambios del repositorio principal -git pull --no-edit +git pull --no-rebase --no-edit # Actualizar dependencias de Ruby bundle && bundle update