From fbba2fa1c9bb60416abbab071dd90c9234929088 Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Sun, 29 Aug 2021 16:10:25 +0200 Subject: [PATCH] feat(git): Add `autoStash` to rebase Signed-off-by: Matej Focko --- playbooks/roles/git/templates/gitconfig.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/playbooks/roles/git/templates/gitconfig.j2 b/playbooks/roles/git/templates/gitconfig.j2 index 696be6b..9fb16b3 100644 --- a/playbooks/roles/git/templates/gitconfig.j2 +++ b/playbooks/roles/git/templates/gitconfig.j2 @@ -23,6 +23,9 @@ [pull] rebase = true +[rebase] + autoStash = true + [user] name = Matej Focko email = {{ git_email }}