diff options
| author | teor <teor@torproject.org> | 2019-10-17 13:47:42 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-17 13:47:42 +1000 |
| commit | e6bb23434e86f65b72b51f4c1d1bb886cbb79d37 (patch) | |
| tree | dc4efb97c0e99e6bbfa6d140a0d54b81c4fdf843 /scripts | |
| parent | 2c97cf3add00bdaadecd4e581dff2d7b30437c33 (diff) | |
| parent | 11b5946e49bc2f92711ef0e3cec9bb6625c5bd14 (diff) | |
| download | tor-e6bb23434e86f65b72b51f4c1d1bb886cbb79d37.tar.gz tor-e6bb23434e86f65b72b51f4c1d1bb886cbb79d37.zip | |
Merge remote-tracking branch 'tor-github/pr/1419'
Obviously correct fixes to code that's already been reviewed.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/git/git-merge-forward.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index d16519b3f5..339573b39c 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -101,7 +101,7 @@ MAINT_041=( "maint-0.4.1" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" \ MAINT_042=( "maint-0.4.2" "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" \ "_042" "_041") MAINT_MASTER=( "master" "maint-0.4.2" "$GIT_PATH/$TOR_MASTER_NAME" \ - "_master" "_041") + "_master" "_042") RELEASE_029=( "release-0.2.9" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" ) RELEASE_035=( "release-0.3.5" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" ) @@ -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'" |