Skip to content

Commit

Permalink
pull: pass --strategy along to to rebase
Browse files Browse the repository at this point in the history
rebase supports --strategy, so pull should pass the option along to it.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jay Soffian authored and Junio C Hamano committed Feb 23, 2008
1 parent eb7a2f1 commit 0d2dd19
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion git-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ fi

merge_name=$(git fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
test true = "$rebase" &&
exec git-rebase --onto $merge_head ${oldremoteref:-$merge_head}
exec git-rebase $strategy_args --onto $merge_head \
${oldremoteref:-$merge_head}
exec git-merge $no_summary $no_commit $squash $no_ff $strategy_args \
"$merge_name" HEAD $merge_head

0 comments on commit 0d2dd19

Please sign in to comment.