web/forgejo
10
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix various typos (#18219)

Browse source 
Found via `codespell -q 3 -S ./options/locale,./vendor -L ba,pullrequest,pullrequests,readby,te,unknwon`

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
luzpaz 2022-01-10 04:32:37 -05:00 • committed by GitHub
parent 242dddfcb7
commit 8c647bf0f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
services/pull/merge.go
View file

@ -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)