jx step git merge

list of jx commands

jx step git merge

Merge a number of SHAs into the HEAD of master

Synopsis

This pipeline step merges any SHAs specified into the HEAD of master.

If no SHAs are specified then the PULL _REFS environment variable will be parsed for a branch:sha comma separated list of shas to merge. For example:

master:ef08a6cd194c2687d4bc12df6bb8a86f53c348ba,2739:5b351f4eae3c4afbb90dd7787f8bf2f8c454723f,2822:bac2a1f34fd54811fb767f69543f59eb3949b2a5

jx step git merge [flags]

Examples

  # Merge the SHAs from the PULL_REFS environment variable
  jx step git merge
  
  # Merge the SHA into the HEAD of master
  jx step git merge --sha 123456a
  
  # Merge a number of SHAs into the HEAD of master
  jx step git merge --sha 123456a --sha 789012b

Options

      --baseBranch string   The branch to merge to, if not specified then the  first entry in PULL_REFS is used 
      --baseSHA string      The SHA to use on the base branch, if not specified then the first entry in PULL_REFS is used
      --dir string          The directory in which the git repo is checked out
  -h, --help                help for merge
      --remote string       The name of the remote (default "origin")
      --sha stringArray     The SHA(s) to merge, if not specified then the value of the env var PULL_REFS is used

Options inherited from parent commands

  -b, --batch-mode   Runs in batch mode without prompting for user input (default true)
      --verbose      Enables verbose output. The environment variable JX_LOG_LEVEL has precedence over this flag and allows setting the logging level to any value of: panic, fatal, error, warn, info, debug, trace

SEE ALSO

Auto generated by spf13/cobra on 30-Jun-2020

Last modified August 14, 2020: release 0.0.1853 (a7b91ef)