mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

git-update: Use --autosquash during pull --rebase

Browse source 
This option has existed forever and allows people to automatically
update and autosquash/pop changes in subproject git repositories.
This commit is contained in:
Nirbheek Chauhan 2016-11-08 23:25:26 +05:30
parent 07424d2fdf
commit 6707b41d08
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-update
View file

@ -46,7 +46,7 @@ def update_repo(repo_name, repo_dir, revision, no_interaction, recurse_i=0):
git("fetch", repository_path=repo_dir) git("fetch", repository_path=repo_dir)
git("checkout", revision, repository_path=repo_dir) git("checkout", revision, repository_path=repo_dir)
else: else:
git("pull", "--rebase", repository_path=repo_dir) git("pull", "--rebase", "--autostash", repository_path=repo_dir)
except Exception as e: except Exception as e:
out = getattr(e, "output", b"").decode() out = getattr(e, "output", b"").decode()
if not no_interaction: if not no_interaction: