Commit 6d1273cf authored by Nick Thomas's avatar Nick Thomas

Merge branch 'simplify-secpick-git-commands' into 'master'

Simplify bin/secpick git commands

See merge request gitlab-org/gitlab-ce!25240
parents 482b91d5 bba8dc7d
...@@ -45,9 +45,7 @@ module Secpick ...@@ -45,9 +45,7 @@ module Secpick
def git_commands def git_commands
["git fetch #{@options[:remote]} #{stable_branch}", ["git fetch #{@options[:remote]} #{stable_branch}",
"git checkout #{stable_branch}", "git checkout -B #{source_branch} #{@options[:remote]}/#{stable_branch}",
"git pull #{@options[:remote]} #{stable_branch}",
"git checkout -B #{source_branch}",
"git cherry-pick #{@options[:sha]}", "git cherry-pick #{@options[:sha]}",
"git push #{@options[:remote]} #{source_branch}", "git push #{@options[:remote]} #{source_branch}",
"git checkout #{original_branch}"] "git checkout #{original_branch}"]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment