File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change 1
- version : 10.0.7
1
+ version : 10.0.8
Original file line number Diff line number Diff line change @@ -128,10 +128,10 @@ if [ -d "$CLONE_DIR" ]; then
128
128
129
129
CURRENT_BRANCH=" ` git branch 2> /dev/null | grep ' ^*' | cut -d' ' -f2-` "
130
130
131
- # If the revision is identical to the current branch we can rebase it with the latest changes. This isn't needed when running detached
131
+ # If the revision is identical to the current branch we can just reset it to the latest changes. This isn't needed when running detached
132
132
if [ " $REVISION " == " $CURRENT_BRANCH " ]; then
133
- echo ' Rebasing current branch $REVISION to latest changes...'
134
- git rebase
133
+ echo ' Resetting current branch $REVISION to latest changes...'
134
+ git reset --hard origin/ $REVISION
135
135
fi
136
136
fi
137
137
else
You can’t perform that action at this time.
0 commit comments