Skip to content

Commit

Permalink
Fix indenting.
Browse files Browse the repository at this point in the history
  • Loading branch information
nvie committed Feb 13, 2012
1 parent 56bff9a commit 7384052
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions git-flow-feature
Expand Up @@ -475,7 +475,7 @@ avoid_accidental_cross_branch_action() {

cmd_pull() {
#DEFINE_string prefix false 'alternative remote feature branch name prefix' p
DEFINE_boolean rebase false "pull with rebase" r
DEFINE_boolean rebase false "pull with rebase" r
parse_remote_name "$@"

if [ -z "$REMOTE" ]; then
Expand All @@ -501,14 +501,14 @@ cmd_pull() {

# we already have a local branch called like this, so simply pull the
# remote changes in
if flag rebase; then
if ! git pull --rebase -q "$REMOTE" "$BRANCH"; then
warn "Pull was aborted. There might be conflicts during rebase or '$REMOTE' might be inaccessible."
exit 1
fi
else
git pull -q "$REMOTE" "$BRANCH" || die "Failed to pull from remote '$REMOTE'."
fi
if flag rebase; then
if ! git pull --rebase -q "$REMOTE" "$BRANCH"; then
warn "Pull was aborted. There might be conflicts during rebase or '$REMOTE' might be inaccessible."
exit 1
fi
else
it pull -q "$REMOTE" "$BRANCH" || die "Failed to pull from remote '$REMOTE'."
fi

echo "Pulled $REMOTE's changes into $BRANCH."
else
Expand Down

0 comments on commit 7384052

Please sign in to comment.