Git with a cup of tea, painless self-hosted git service
Mirror for internal git.with.parts use
https://git.with.parts
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
|
|
|
|
---
|
|
|
|
|
date: "2022-08-31T17:35:40+08:00"
|
|
|
|
|
title: "Merge Message templates"
|
|
|
|
|
slug: "merge-message-templates"
|
|
|
|
|
weight: 15
|
|
|
|
|
toc: false
|
|
|
|
|
draft: false
|
Refactor docs (#23752)
This was intended to be a small followup for
https://github.com/go-gitea/gitea/pull/23712, but...here we are.
1. Our docs currently use `slug` as the entire URL, which makes
refactoring tricky (see https://github.com/go-gitea/gitea/pull/23712).
Instead, this PR attempts to make future refactoring easier by using
slugs as an extension of the section. (Hugo terminology)
- What the above boils down to is this PR attempts to use directory
organization as URL management. e.g. `usage/comparison.en-us.md` ->
`en-us/usage/comparison/`, `usage/packages/overview.en-us.md` ->
`en-us/usage/packages/overview/`
- Technically we could even remove `slug`, as Hugo defaults to using
filename, however at least with this PR it means `slug` only needs to be
the name for the **current file** rather than an entire URL
2. This PR adds appropriate aliases (redirects) for pages, so anything
on the internet that links to our docs should hopefully not break.
3. A minor nit I've had for a while, renaming `seek-help` to `support`.
It's a minor thing, but `seek-help` has a strange connotation to it.
4. The commits are split such that you can review the first which is the
"actual" change, and the second is added redirects so that the first
doesn't break links elsewhere.
---------
Signed-off-by: jolheiser <john.olheiser@gmail.com>
2 years ago
|
|
|
aliases:
|
|
|
|
|
- /en-us/merge-message-templates
|
|
|
|
|
menu:
|
|
|
|
|
sidebar:
|
|
|
|
|
parent: "usage"
|
|
|
|
|
name: "Merge Message templates"
|
|
|
|
|
weight: 15
|
|
|
|
|
identifier: "merge-message-templates"
|
|
|
|
|
---
|
|
|
|
|
|
|
|
|
|
# Merge Message templates
|
|
|
|
|
|
|
|
|
|
**Table of Contents**
|
|
|
|
|
|
|
|
|
|
{{< toc >}}
|
|
|
|
|
|
|
|
|
|
## File names
|
|
|
|
|
|
|
|
|
|
Possible file names for PR default merge message templates:
|
|
|
|
|
|
|
|
|
|
- `.gitea/default_merge_message/MERGE_TEMPLATE.md`
|
|
|
|
|
- `.gitea/default_merge_message/REBASE_TEMPLATE.md`
|
|
|
|
|
- `.gitea/default_merge_message/REBASE-MERGE_TEMPLATE.md`
|
|
|
|
|
- `.gitea/default_merge_message/SQUASH_TEMPLATE.md`
|
|
|
|
|
- `.gitea/default_merge_message/MANUALLY-MERGED_TEMPLATE.md`
|
|
|
|
|
- `.gitea/default_merge_message/REBASE-UPDATE-ONLY_TEMPLATE.md`
|
|
|
|
|
|
|
|
|
|
## Variables
|
|
|
|
|
|
|
|
|
|
You can use the following variables enclosed in `${}` inside these templates which follow [os.Expand](https://pkg.go.dev/os#Expand) syntax:
|
|
|
|
|
|
|
|
|
|
- BaseRepoOwnerName: Base repository owner name of this pull request
|
|
|
|
|
- BaseRepoName: Base repository name of this pull request
|
|
|
|
|
- BaseBranch: Base repository target branch name of this pull request
|
|
|
|
|
- HeadRepoOwnerName: Head repository owner name of this pull request
|
|
|
|
|
- HeadRepoName: Head repository name of this pull request
|
|
|
|
|
- HeadBranch: Head repository branch name of this pull request
|
|
|
|
|
- PullRequestTitle: Pull request's title
|
|
|
|
|
- PullRequestDescription: Pull request's description
|
|
|
|
|
- PullRequestPosterName: Pull request's poster name
|
|
|
|
|
- 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`
|
