diff options
| author | Joey Hess <joey@kitenet.net> | 2014-02-23 14:19:39 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-23 14:19:39 -0400 |
| commit | c1fbd66c031980f89e6b28862fe90813b1074c2e (patch) | |
| tree | 725978ac514388e0e4c4757c8c497f564cf8d0db /IkiWiki/Plugin | |
| parent | b5b8c5cecc0b5d69e4e30db6909d083a78e425ea (diff) | |
| parent | be3483fe9be559a62dd88577b3a374d55b7262f3 (diff) | |
| download | ikiwiki-c1fbd66c031980f89e6b28862fe90813b1074c2e.tar ikiwiki-c1fbd66c031980f89e6b28862fe90813b1074c2e.tar.gz | |
Merge remote-tracking branch 'remotes/smcv/ready/git-push-origin-master'
Diffstat (limited to 'IkiWiki/Plugin')
| -rw-r--r-- | IkiWiki/Plugin/git.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 9e67a36ee..4b0e5a86d 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -609,7 +609,7 @@ sub rcs_commit_helper (@) { # So we should ignore its exit status (hence run_or_non). if (run_or_non('git', 'commit', '-m', $params{message}, '-q', @opts)) { if (length $config{gitorigin_branch}) { - run_or_cry('git', 'push', $config{gitorigin_branch}); + run_or_cry('git', 'push', $config{gitorigin_branch}, $config{gitmaster_branch}); } } |