From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Tue, 8 Nov 2016 17:55:26 +0000 (+0530)
Subject: git-update: Use --autosquash during pull --rebase
X-Git-Tag: 1.19.3~481^2~406
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6707b41d08268b7c6d0d7a4b420927003736b107;p=platform%2Fupstream%2Fgstreamer.git

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.
---

diff --git a/git-update b/git-update
index ee65a23..a53d678 100755
--- a/git-update
+++ b/git-update
@@ -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: