Pull with --rebase and --autostash (fix #2)
This commit is contained in:
@@ -40,7 +40,13 @@ impl Git {
|
|||||||
|
|
||||||
pub fn pull<P: AsRef<Path>>(&self, path: P) -> Result<()> {
|
pub fn pull<P: AsRef<Path>>(&self, path: P) -> Result<()> {
|
||||||
if let Some(git) = &self.git {
|
if let Some(git) = &self.git {
|
||||||
if let Ok(mut command) = Command::new(&git).arg("pull").current_dir(path).spawn() {
|
if let Ok(mut command) = Command::new(&git)
|
||||||
|
.arg("pull")
|
||||||
|
.arg("--rebase")
|
||||||
|
.arg("--autostash")
|
||||||
|
.current_dir(path)
|
||||||
|
.spawn()
|
||||||
|
{
|
||||||
command.wait()?;
|
command.wait()?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user