Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature auto suggest commit messages #129

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
Keep local changes when pulling.
  • Loading branch information
fvmartin committed Feb 27, 2018
commit 899203f55eb8e7ef636f21cb38de1fa0dc8bc429
2 changes: 1 addition & 1 deletion classes/class-revisr-git.php
Original file line number Diff line number Diff line change
@@ -622,7 +622,7 @@ public function merge( $branch ) {
* @param array $commits The commits we're pulling (used in callback).
*/
public function pull( $commits = array() ) {
$this->reset();
//$this->reset();
$pull = $this->run( 'pull', array( '-Xtheirs', '--quiet', $this->remote, $this->branch ), __FUNCTION__, $commits );
return $pull;
}
4 changes: 2 additions & 2 deletions classes/class-revisr-process.php
Original file line number Diff line number Diff line change
@@ -238,9 +238,9 @@ public function pull() {
Revisr_Admin::verify_nonce( $_REQUEST['revisr_dashboard_nonce'], 'revisr_dashboard_nonce' );

// Fetch the changes so we can compare them.
revisr()->git->reset();
//revisr()->git->reset();
revisr()->git->fetch();

// Build an array of the commits we don't have locally.
$commits_since = revisr()->git->run( 'log', array( revisr()->git->branch . '..' . revisr()->git->remote . '/' . revisr()->git->branch, '--pretty=oneline' ) );