diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-08 23:25:26 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-08 23:30:16 +0530 |
| commit | 6707b41d08268b7c6d0d7a4b420927003736b107 (patch) | |
| tree | 79923a8aee95b2b7f2bb95ed1476c3bbe268b97d /git-update | |
| parent | 07424d2fdfdcc46631db74892e89464f728aa9c3 (diff) | |
git-update: Use --autosquash during pull --rebase
This option has existed forever and allows people to automatically
update and autosquash/pop changes in subproject git repositories.
Diffstat (limited to 'git-update')
| -rwxr-xr-x | git-update | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -46,7 +46,7 @@ def update_repo(repo_name, repo_dir, revision, no_interaction, recurse_i=0): git("fetch", repository_path=repo_dir) git("checkout", revision, repository_path=repo_dir) else: - git("pull", "--rebase", repository_path=repo_dir) + git("pull", "--rebase", "--autostash", repository_path=repo_dir) except Exception as e: out = getattr(e, "output", b"").decode() if not no_interaction: |