Merge remote-tracking branch 'remotes/smcv/ready/git-push-origin-master'

master
Joey Hess 2014-02-23 14:19:39 -04:00
commit c1fbd66c03
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -9,6 +9,7 @@ ikiwiki.out
ikiwiki-transition.out
ikiwiki-calendar.out
pm_to_blib
/MYMETA.json
/MYMETA.yml
*.man
/po/cover_db

View File

@ -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});
}
}