pull: pass --strategy along to to rebase
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>
Jay Soffian committed
Feb 22, 2008 at 19:52 UTC
0d2dd191cdfa3f1795c4df60a5cfb0f7e58c097a
1 file changed
+2
-1
git-pull.sh
+2
-1
@@ -174,6 +174,7 @@ fi
174
175
merge_name=$(git fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
176
test true = "$rebase" &&
177
- exec git-rebase --onto $merge_head ${oldremoteref:-$merge_head}
177
+ exec git-rebase $strategy_args --onto $merge_head \
178
+ ${oldremoteref:-$merge_head}
179
exec git-merge $no_summary $no_commit $squash $no_ff $strategy_args \
180
"$merge_name" HEAD $merge_head