From 9e7db2b10e7b94d95f81a6d86257c63751e80253 Mon Sep 17 00:00:00 2001
From: Christian Ringger <ringger@phys.ethz.ch>
Date: Tue, 4 Oct 2022 14:44:28 +0200
Subject: [PATCH] change git setting
---
profile/globi/.gitconfig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/profile/globi/.gitconfig b/profile/globi/.gitconfig
index c79836e..27e3aec 100644
--- a/profile/globi/.gitconfig
+++ b/profile/globi/.gitconfig
@@ -75,13 +75,13 @@
[pull]
# Only pull if fast-forward is possible. Use `git pull --rebase` or `git pull --no-ff` otherwise.
- ff = only
+ #ff = only
# Use `git pull --rebase` by default, otherwise use `git fetch; git merge`
- #rebase = true
+ rebase = true
[rebase]
# Automatically stash and pop your uncommitted changes
- #autoStash = true
+ autoStash = true
[alias]
co = checkout
--
GitLab