]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
scripts: Fix a git script comment
authorteor <teor@torproject.org>
Tue, 15 Oct 2019 03:58:53 +0000 (13:58 +1000)
committerteor <teor@torproject.org>
Tue, 15 Oct 2019 03:58:53 +0000 (13:58 +1000)
scripts/git/git-merge-forward.sh

index 59adbab82db86e0f15cd449a88dc2c3d9b1c6490..339573b39c0efbf189ed4bf9cc60838cd573abd8 100755 (executable)
@@ -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'"