git-cherry-pick.json

{
  "goalTreeString": "%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C1%22%2C%22id%22%3A%22master%22%2C%22remoteTrackingBranchID%22%3Anull%7D%2C%22ph1%22%3A%7B%22target%22%3A%22C3%22%2C%22id%22%3A%22ph1%22%2C%22remoteTrackingBranchID%22%3Anull%7D%2C%22ph2%22%3A%7B%22target%22%3A%22C5%22%2C%22id%22%3A%22ph2%22%2C%22remoteTrackingBranchID%22%3Anull%7D%2C%22ph3%22%3A%7B%22target%22%3A%22C5%27%22%2C%22id%22%3A%22ph3%22%2C%22remoteTrackingBranchID%22%3Anull%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C6%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C6%22%7D%2C%22C2%27%22%3A%7B%22parents%22%3A%5B%22C6%22%5D%2C%22id%22%3A%22C2%27%22%7D%2C%22C5%27%22%3A%7B%22parents%22%3A%5B%22C2%27%22%5D%2C%22id%22%3A%22C5%27%22%7D%7D%2C%22tags%22%3A%7B%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22ph3%22%2C%22id%22%3A%22HEAD%22%7D%7D",
  "solutionCommand": "git checkout ph3;git cherry-pick C2 C5",
  "startTree": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"ph1\":{\"target\":\"C3\",\"id\":\"ph1\",\"remoteTrackingBranchID\":null},\"ph2\":{\"target\":\"C5\",\"id\":\"ph2\",\"remoteTrackingBranchID\":null},\"ph3\":{\"target\":\"C6\",\"id\":\"ph3\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C2\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C1\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C4\"],\"id\":\"C5\"},\"C6\":{\"parents\":[\"C1\"],\"id\":\"C6\"}},\"tags\":{},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}",
  "name": {
    "en_US": "cherry-pick"
  },
  "hint": {
    "en_US": null
  },
  "startDialog": {
    "en_US": {
      "childViews": [
        {
          "type": "GitDemonstrationView",
          "options": {
            "beforeMarkdowns": [
              "## cherry-pick",
              "",
              "cherry-pickはいらなくなったブランチからこのコミットだけ残したい！というときに便利です。",
              "",
              "ver101を先にリリースするけど、C2だけはver101に必要。という状況だった場合"
            ],
            "afterMarkdowns": [
              "これでC2を生かすことができました。"
            ],
            "command": "git cherry-pick C2",
            "beforeCommand": "git checkout -b ver100;git commit;git commit;git checkout master;git checkout -b ver101; git commit; "
          }
        }
      ]
    }
  }
}