mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
scripts: Fix a git script comment
This commit is contained in:
@@ -333,7 +333,7 @@ function merge_branch
|
||||
fi
|
||||
}
|
||||
|
||||
# Pull the given branch name.
|
||||
# Merge origin/(branch name) into the current branch.
|
||||
function merge_branch_origin
|
||||
{
|
||||
local cmd="git merge --ff-only 'origin/$1'"
|
||||
|
||||
Reference in New Issue
Block a user