diff options
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'" |