Skip to content

Commit

Permalink
Fix whitespace issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
nvie committed Jul 21, 2010
1 parent 8a86c48 commit cb654b1
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions git-flow-feature
Expand Up @@ -283,17 +283,17 @@ cmd_finish() {

# update local repo with remote changes first, if asked
if has "$ORIGIN/$BRANCH" "$(git_remote_branches)"; then
if flag fetch; then
git fetch -q "$ORIGIN" "$BRANCH"
fi
if flag fetch; then
git fetch -q "$ORIGIN" "$BRANCH"
fi
fi

if has "$ORIGIN/$BRANCH" "$(git_remote_branches)"; then
require_branches_equal "$BRANCH" "$ORIGIN/$BRANCH"
fi
if has "$ORIGIN/$DEVELOP_BRANCH" "$(git_remote_branches)"; then
require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
fi
require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
fi

# if the user wants to rebase, do that first
if flag rebase; then
Expand Down

0 comments on commit cb654b1

Please sign in to comment.