diff --git a/gclient_scm.py b/gclient_scm.py index 8380b34516..955c35dacd 100644 --- a/gclient_scm.py +++ b/gclient_scm.py @@ -213,6 +213,8 @@ class GitWrapper(SCMWrapper, scm.GIT): self._Run(['remote', 'update'], redirect_stdout=False) files = self._Run(['diff', new_base, '--name-only']).split() file_list.extend([os.path.join(self.checkout_path, f) for f in files]) + if options.force: + self._Run(['reset', '--hard', merge_base], redirect_stdout=False) self._Run(['rebase', '-v', '--onto', new_base, merge_base, cur_branch], redirect_stdout=False, checkrc=False)