Re: 0800-GIT-HELP: Doing a simple backport

2020-05-19 Thread Jonathan Wakely via Gcc
On Tue, 19 May 2020 at 17:36, Jonathan Wakely wrote: > > On Tue, 19 May 2020 at 17:19, Gerald Pfeifer wrote: > > > > I hope the offer by some of you to support people like me who Git > > appears to hate with a fervor still stands? ;-) > > > > And I volunteer to enhance our documentation if it

Re: 0800-GIT-HELP: Doing a simple backport

2020-05-19 Thread Jonathan Wakely via Gcc
On Tue, 19 May 2020 at 17:19, Gerald Pfeifer wrote: > > I hope the offer by some of you to support people like me who Git > appears to hate with a fervor still stands? ;-) > > And I volunteer to enhance our documentation if it appears useful. > > > Usecase: I've got a patch approved and pushed to

Re: 0800-GIT-HELP: Doing a simple backport

2020-05-19 Thread Andreas Schwab
On Mai 19 2020, Gerald Pfeifer wrote: > What now? $ sudo zypper in git-merge-changelog $ git config --global merge.merge-changelog.name "GNU-style ChangeLog merge driver" $ git config --global merge.merge-changelog.driver "git-merge-changelog %O %A %B" $ printf

0800-GIT-HELP: Doing a simple backport

2020-05-19 Thread Gerald Pfeifer
I hope the offer by some of you to support people like me who Git appears to hate with a fervor still stands? ;-) And I volunteer to enhance our documentation if it appears useful. Usecase: I've got a patch approved and pushed to HEAD, and approved for active release branches -