Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-19 17:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

git autostash

Browse Source
This commit is contained in:
Vladimir Mandic
2023-08-03 17:49:52 +02:00
parent 6fbc9a53f8
commit d7ae6c61e1
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
installer.py
+7 -3
View File
@@ -234,14 +234,18 @@ def branch(folder):
# update git repository
def update(folder, current_branch = False):
try:
git('config rebase.Autostash true')
except Exception:
pass
if current_branch:
git('pull --autostash --rebase --force', folder)
git('pull --rebase --force', folder)
return
b = branch(folder)
if branch is None:
git('pull --autostash --rebase --force', folder)
git('pull --rebase --force', folder)
else:
git(f'pull origin {b} --autostash --rebase --force', folder)
git(f'pull origin {b} --rebase --force', folder)
# clone git repository