Re: git-fu is weak

Am 2020-02-24 um 21:35 schrieb Christopher Schultz: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Michael, On 2/24/20 14:15, Michael Osipov wrote: Am 2020-02-24 um 17:33 schrieb Christopher Schultz: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 All, I'm trying to cherry-pick a commit.

Re: git-fu is weak

-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Michael, On 2/24/20 14:15, Michael Osipov wrote: > Am 2020-02-24 um 17:33 schrieb Christopher Schultz: >> -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 >> >> All, >> >> I'm trying to cherry-pick a commit. The commit went through >> github, merged

Re: git-fu is weak

Am 2020-02-24 um 17:33 schrieb Christopher Schultz: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 All, I'm trying to cherry-pick a commit. The commit went through github, merged a PR from a contributor into master. I'm trying to cherry-pick it back into the 9.0.x branch: $ git cherry-pick

Re: git-fu is weak

пн, 24 февр. 2020 г. в 19:40, Emmanuel Bourg : > > Le 24/02/2020 à 17:33, Christopher Schultz a écrit : > > > Any ideas? > > I guess you are cherry picking the merge commit, instead of the actual > commit(s) from the PR branch. >

Re: git-fu is weak

Le 24/02/2020 à 17:33, Christopher Schultz a écrit : > Any ideas? I guess you are cherry picking the merge commit, instead of the actual commit(s) from the PR branch. Emmanuel Bourg - To unsubscribe, e-mail:

git-fu is weak

-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 All, I'm trying to cherry-pick a commit. The commit went through github, merged a PR from a contributor into master. I'm trying to cherry-pick it back into the 9.0.x branch: $ git cherry-pick f124a9c7230227d3eaff9d2dc1c52f82ce10e03f error: commit