[tor-commits] [tor/master] scripts: Fix a git script comment

commit 11b5946e49bc2f92711ef0e3cec9bb6625c5bd14 Author: teor teor@torproject.org Date: Tue Oct 15 13:58:53 2019 +1000

scripts: Fix a git script comment --- scripts/git/git-merge-forward.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index 59adbab82..339573b39 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -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'"