diff options
| author | luzpaz <luzpaz@users.noreply.github.com> | 2022-01-10 04:32:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-10 17:32:37 +0800 |
| commit | 8c647bf0f6b19fe666c645ec16010d07bfe85a63 (patch) | |
| tree | eaa322e1244591b00a36b7d79ce416bd1bd932af /services/pull | |
| parent | 242dddfcb7cfab1d21c1658828d94f603809a5c7 (diff) | |
| download | gitea-8c647bf0f6b19fe666c645ec16010d07bfe85a63.tar.gz gitea-8c647bf0f6b19fe666c645ec16010d07bfe85a63.zip | |
Fix various typos (#18219)
Found via `codespell -q 3 -S ./options/locale,./vendor -L ba,pullrequest,pullrequests,readby,te,unknwon`
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'services/pull')
| -rw-r--r-- | services/pull/merge.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/pull/merge.go b/services/pull/merge.go index e541495bef..34cab2fd71 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -437,7 +437,7 @@ func rawMerge(pr *models.PullRequest, doer *user_model.User, mergeStyle repo_mod var pushCmd *git.Command if mergeStyle == repo_model.MergeStyleRebaseUpdate { - // force push the rebase result to head brach + // force push the rebase result to head branch pushCmd = git.NewCommand("push", "-f", "head_repo", stagingBranch+":"+git.BranchPrefix+pr.HeadBranch) } else { pushCmd = git.NewCommand("push", "origin", baseBranch+":"+git.BranchPrefix+pr.BaseBranch) |