mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-23 22:47:12 +01:00
Code Issues Projects Releases Wiki Activity

scripts: Fix a git script comment

Browse source
This commit is contained in:
teor 2019-10-15 13:58:53 +10:00
parent 028987a0a1
commit 11b5946e49
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/git/git-merge-forward.sh
View file

@ -333,7 +333,7 @@ function merge_branch
fi fi
} }
# Pull the given branch name. # Merge origin/(branch name) into the current branch.
function merge_branch_origin function merge_branch_origin
{ {
local cmd="git merge --ff-only 'origin/$1'" local cmd="git merge --ff-only 'origin/$1'"