add rebase flag for force pushes and diverging local history
This commit is contained in:
parent
498a3ddf6c
commit
4d70986d2e
1 changed files with 1 additions and 0 deletions
|
@ -16,6 +16,7 @@ pub async fn update_repo(repo: &RepoConfig) -> Result<ExitStatus> {
|
||||||
Command::new("git")
|
Command::new("git")
|
||||||
.current_dir(&repo.path)
|
.current_dir(&repo.path)
|
||||||
.arg("pull")
|
.arg("pull")
|
||||||
|
.arg("--rebase")
|
||||||
.stdin(Stdio::null())
|
.stdin(Stdio::null())
|
||||||
.spawn()?
|
.spawn()?
|
||||||
.wait()
|
.wait()
|
||||||
|
|
Loading…
Reference in a new issue