Hi All,
tl;dr `git diff --no-prefix master diff.patch; patch -p0 diff.patch`
is useful for landing bug fixes in different versions of juju.
As a lot of us are currently bug hunting and needing to land fixes in
multiple versions of Juju, I thought I'd share my process of doing that
(maybe
git cherry-pick does this as a git command.
Tim
On 05/05/15 13:03, Jesse Meek wrote:
Hi All,
tl;dr `git diff --no-prefix master diff.patch; patch -p0 diff.patch`
is useful for landing bug fixes in different versions of juju.
As a lot of us are currently bug hunting and needing to land
Yes, cheery pick is something I use all the time, as it fills out the PR in the
latter branches with a nice commit message based on the original and also
includes the original PR from which the commit was first done.
On 05/05/15 11:45, Jesse Meek wrote:
Ah, even better. Now I can update my
Ah, even better. Now I can update my workflow :)
On 05/05/15 13:43, Menno Smits wrote:
cherry-pick will even grab the top commit of a branch if you give the
branch name (presuming the fix is a single commit). For example:
git checkout -b bug-fix-1.24 upstream/1.24 # create a branch for the
