diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2023-05-22 03:01:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-22 09:01:46 +0800 |
| commit | 2d3ebe889e7c25152821d4456b651e00fad43da1 (patch) | |
| tree | 0fe99db30d114e9ef341920d43aade7f33acb850 /docs | |
| parent | 84d93c82cdab15681ff3accb8b911ef94d8bafcc (diff) | |
| download | gitea-2d3ebe889e7c25152821d4456b651e00fad43da1.tar.gz gitea-2d3ebe889e7c25152821d4456b651e00fad43da1.zip | |
Merge message template support for rebase without merge commit (#22669)
Use `default_merge_message/REBASE_TEMPLATE.md` for amending the message
of the last commit in the list of commits that was merged. Previously
this template was mentioned in the documentation but not actually used.
In this template additional variables `CommitTitle` and `CommitBody` are
available, for the title and body of the commit.
Ideally the message of every commit would be updated using the template,
but doing an interactive rebase or merging commits one by one is
complicated, so that is left as a future improvement.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/content/doc/usage/merge-message-templates.en-us.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/content/doc/usage/merge-message-templates.en-us.md b/docs/content/doc/usage/merge-message-templates.en-us.md index 751f07e13f..03095a3bbe 100644 --- a/docs/content/doc/usage/merge-message-templates.en-us.md +++ b/docs/content/doc/usage/merge-message-templates.en-us.md @@ -48,3 +48,10 @@ You can use the following variables enclosed in `${}` inside these templates whi - PullRequestIndex: Pull request's index number - PullRequestReference: Pull request's reference char with index number. i.e. #1, !2 - ClosingIssues: return a string contains all issues which will be closed by this pull request i.e. `close #1, close #2` + +## Rebase + +When rebasing without a merge commit, `REBASE_TEMPLATE.md` modifies the message of the last commit. The following additional variables are available in this template: + +- CommitTitle: Commit's title +- CommitBody: Commits's body text |