[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Release branch added to git
From: |
Patrice Dumas |
Subject: |
Re: Release branch added to git |
Date: |
Sun, 13 Nov 2022 00:38:44 +0100 |
On Sat, Nov 12, 2022 at 11:25:04PM +0000, Gavin Smith wrote:
> > I can do that change/commit on the 7.0 branch.
>
> OK that's fine. You can either do
>
> git cherry-pick b238da561dad6
>
> and then to remove parts of the commit, do
>
> git reset --soft HEAD^
>
> followed by
>
> git reset .
> git checkout --patch
> git add -u
>
> etc., or if you prefer you can start the commit from scratch. I'm
> not sure if it makes a difference either way - it tells you when
> you are committing that you are cherry-picking, but I can't see that
> this is recorded anywhere afterwards.
I redid from scratch, it was simpler that way, but thanks for the tips.
--
Pat
- Re: git structure and release policy, (continued)
- Re: git structure and release policy, Gavin Smith, 2022/11/08
- Release branch added to git, Gavin Smith, 2022/11/12
- Re: Release branch added to git, Raymond Toy, 2022/11/12
- Re: Release branch added to git, Gavin Smith, 2022/11/12
- Re: Release branch added to git, Raymond Toy, 2022/11/12
- Re: Release branch added to git, Patrice Dumas, 2022/11/12
- Re: Release branch added to git, Gavin Smith, 2022/11/12
- Re: Release branch added to git, Patrice Dumas, 2022/11/12
- Re: Release branch added to git, Patrice Dumas, 2022/11/12
- Re: Release branch added to git, Gavin Smith, 2022/11/12
- Re: Release branch added to git,
Patrice Dumas <=
- Re: Release branch added to git, Robert Pluim, 2022/11/23
- Re: Release branch added to git, Gavin Smith, 2022/11/23
Re: git structure and release policy, Sam James, 2022/11/08