Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Complements the documentation for pattern files and exclude files, fixes #5236 [1.1] #5524

Merged
merged 1 commit into from
Dec 4, 2020

Conversation

Gu1nness
Copy link
Contributor

Backporting #5520 to 1.1-maint

@ThomasWaldmann
Copy link
Member

ThomasWaldmann commented Dec 1, 2020

Hmm, the commit comment was lost for all these backport PRs.

When doing a release, I create the CHANGES entries from git log - if there is only a ticket number, I have to look it up for every commit, which is quite a lot of work...

I usually use git cherry-pick <COMMIT> to backport, which also backports the commit comment.

As you've already done the backporting and only the commit comment needs changing, maybe do an empty git commit --amend and only edit the commit comment, taking the text from the original commit you've backported. Then git push -f to update the PR.

@ThomasWaldmann ThomasWaldmann changed the title Backport #5520 to 1.1-maint Complements the documentation for pattern files and exclude files, fixes #5236 [1.1] Dec 2, 2020
@ThomasWaldmann
Copy link
Member

@Gu1nness please fix commit comment here also.

@ThomasWaldmann ThomasWaldmann merged commit 954be6d into borgbackup:1.1-maint Dec 4, 2020
@ThomasWaldmann
Copy link
Member

thanks!

@ghost ghost mentioned this pull request Aug 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants