diff options
| author | teor <teor@torproject.org> | 2019-10-15 13:58:53 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-15 13:58:53 +1000 |
| commit | 11b5946e49bc2f92711ef0e3cec9bb6625c5bd14 (patch) | |
| tree | 019e60f649fd2bd0f1f4a4cd04ca195cb050d549 /scripts/git | |
| parent | 028987a0a1e841d7faf3ac131b0bd2795a963aa5 (diff) | |
| download | tor-11b5946e49bc2f92711ef0e3cec9bb6625c5bd14.tar.gz tor-11b5946e49bc2f92711ef0e3cec9bb6625c5bd14.zip | |
scripts: Fix a git script comment
Diffstat (limited to 'scripts/git')
| -rwxr-xr-x | scripts/git/git-merge-forward.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index 59adbab82d..339573b39c 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'" |