Skip to content

Instantly share code, notes, and snippets.

@ikawaha
Last active April 4, 2017 01:20
Show Gist options
  • Save ikawaha/c9e86ce3a9a0607ede6f7e77167f9fe6 to your computer and use it in GitHub Desktop.
Save ikawaha/c9e86ce3a9a0607ede6f7e77167f9fe6 to your computer and use it in GitHub Desktop.
cherry-pick

(1) master の該当の差分を探しておく

$ git log|head -15
commit e4ce857d53544c2f9c3a81c5fcf4b7c7dc4bb6ce
Author: Raphaël Simon <[email protected]>
Date:   Sun Apr 2 18:01:16 2017 -0700

    Update generated file headers to match new Go standard (#1160)

    as described in https://github.com/golang/go/issues/13560

commit c62b05f5f027658ba733581f2c8d428deb4d8026    ← ★これを覚えておく
Author: Jumpei <[email protected]>
Date:   Mon Apr 3 09:59:24 2017 +0900

    Fix problem not starting with appengine (#1153)

commit e4eed4792ee5e23fc431890a1d22c326ceeb5a89

(2) v1 ブランチからブランチはやす

$ git checkout -b fix/appengine_metrics --track origin/v1

(3) cherry-pick

$ git cherry-pick c62b05f5f027658ba733581f2c8d428deb4d8026

(4) あとは自分のリポジトリに push して本家の v1 ブランチに pr する

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment