diff options
author | Rob Loach <robloach@gmail.com> | 2013-12-25 08:11:31 -0500 |
---|---|---|
committer | Rob Loach <robloach@gmail.com> | 2013-12-25 08:11:31 -0500 |
commit | 41194dde2c4950ac519cfb09c35aa6056d445875 (patch) | |
tree | 70c5fa6df5b71b838e1c3d13d4873399a3942488 | |
parent | 7ac95ae857f496dc6092d978fdd1b12d0dc13b83 (diff) | |
download | git-deploy-0.0.3.zip git-deploy-0.0.3.tar.gz git-deploy-0.0.3.tar.bz2 |
Fetch and reset0.0.3
-rw-r--r-- | src/GitHubPagesDeploy/GitHubPagesDeploy.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/GitHubPagesDeploy/GitHubPagesDeploy.php b/src/GitHubPagesDeploy/GitHubPagesDeploy.php index bcf2fde..0fb0a0c 100644 --- a/src/GitHubPagesDeploy/GitHubPagesDeploy.php +++ b/src/GitHubPagesDeploy/GitHubPagesDeploy.php @@ -45,17 +45,8 @@ class GitHubPagesDeploy // Fetch all the latest. $git->fetch('--all'); - // Remove any local changes. - $git->reset(array('hard' => true)); - - // Clean up the repository. - $git->run(array('clean', array('d' => TRUE, 'f' => TRUE))); - - // Ensure we are on the correct branch. - $git->checkout('gh-pages', array('force' => TRUE)); - - // Finally, pull in the changes. - $git->pull(); + // Reset over to the gh-pages branch. + $git->reset('origin/gh-pages', array('hard' => true)); } } |