Locate the section for your github remote in the .git/config file. It looks like this:
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = [email protected]:joyent/node.git
Now add the line fetch = +refs/pull/*/head:refs/remotes/origin/pr/* to this section. Obviously, change the github url to match your project's URL. It ends up looking like this:
This method is harder than using the get reset method above. Also it doesn't work well if you merged the master into the feature branch previously (you'll need to resolve all conflicts again).
What we are describing here will destroy commit history and can go wrong. For this reason, do the squashing on a separate branch:
git checkout -b squashed_feature
To squash all commits since you branched away from master, do
git rebase -i master
| alias javaws='/Library/Internet\ Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/javaws' |
| # Install | |
| Download the package here http://www.lsi.com/support/Pages/download-results.aspx?keyword=megacli | |
| Extract it | |
| On RHEL, Install the rpm under Linux | |
| On Ubuntu: | |
| apt-get install rpm2cpio | |
| cd Linux; rpm2cpio MegaCli-*.rpm | cpio -idmv | |
| # Usage | |
| List all physical disks: |
| import jenkins.model.* | |
| import com.cloudbees.plugins.credentials.* | |
| import com.cloudbees.plugins.credentials.common.* | |
| import com.cloudbees.plugins.credentials.domains.* | |
| import com.cloudbees.plugins.credentials.impl.* | |
| import com.cloudbees.jenkins.plugins.sshcredentials.impl.* | |
| import org.jenkinsci.plugins.plaincredentials.* | |
| import org.jenkinsci.plugins.plaincredentials.impl.* | |
| import hudson.util.Secret | |
| import hudson.plugins.sshslaves.* |
| # npm using https for git | |
| git config --global url."https://github.com/".insteadOf [email protected]: | |
| git config --global url."https://".insteadOf git:// | |
| # npm using git for https | |
| git config --global url."[email protected]:".insteadOf https://github.com/ | |
| git config --global url."git://".insteadOf https:// |
| import org.csanchez.jenkins.plugins.kubernetes.* | |
| import jenkins.model.* | |
| def j = Jenkins.getInstance() | |
| def k = new KubernetesCloud( | |
| 'jenkins-test', | |
| null, | |
| 'https://130.211.146.130', | |
| 'default', |
| # Finding Files | |
| SPC ft # Toggle NeoTree | |
| SPC pt # Open project root | |
| SPC ff # Find a file with Helm | |
| # Buffers / Files | |
| SPC fs # Save file | |
| SPC bd # Close buffer | |
| SPC TAB # Switch between open buffers |
| /* | |
| * Configure the Jenkins EC2 Plugin via Groovy Script | |
| * EC2 Plugin URL: https://wiki.jenkins-ci.org/display/JENKINS/Amazon+EC2+Plugin | |
| */ | |
| import hudson.model.* | |
| import jenkins.model.* | |
| import hudson.plugins.ec2.* | |
| import com.amazonaws.services.ec2.model.InstanceType | |