We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 8a86c48 commit cb654b1Copy full SHA for cb654b1
1 file changed
git-flow-feature
@@ -283,17 +283,17 @@ cmd_finish() {
283
284
# update local repo with remote changes first, if asked
285
if has "$ORIGIN/$BRANCH" "$(git_remote_branches)"; then
286
- if flag fetch; then
287
- git fetch -q "$ORIGIN" "$BRANCH"
288
- fi
+ if flag fetch; then
+ git fetch -q "$ORIGIN" "$BRANCH"
+ fi
289
fi
290
291
292
require_branches_equal "$BRANCH" "$ORIGIN/$BRANCH"
293
294
if has "$ORIGIN/$DEVELOP_BRANCH" "$(git_remote_branches)"; then
295
- require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
296
+ require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
297
298
# if the user wants to rebase, do that first
299
if flag rebase; then
0 commit comments