From 5ec02211214350ee558fd9f6bb052264fd24f75e Mon Sep 17 00:00:00 2001 From: Agustin Henze Date: Tue, 21 Oct 2014 10:33:15 -0300 Subject: Imported Upstream version 7.1.0 --- nikola/plugins/command/github_deploy.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nikola/plugins/command/github_deploy.py') diff --git a/nikola/plugins/command/github_deploy.py b/nikola/plugins/command/github_deploy.py index d4dd8c5..13da48c 100644 --- a/nikola/plugins/command/github_deploy.py +++ b/nikola/plugins/command/github_deploy.py @@ -135,9 +135,10 @@ class CommandGitHubDeploy(Command): ) commands = [ + ['git', 'pull', remote, '%s:%s' % (deploy, deploy)], ['git', 'add', '-A'], ['git', 'commit', '-m', commit_message], - ['git', 'push', '-f', remote, '%s:%s' % (deploy, deploy)], + ['git', 'push', remote, '%s:%s' % (deploy, deploy)], ['git', 'checkout', source], ] -- cgit v1.2.3