From 0d2dd191cdfa3f1795c4df60a5cfb0f7e58c097a Mon Sep 17 00:00:00 2001 From: Jay Soffian Date: Fri, 22 Feb 2008 19:52:29 -0500 Subject: pull: pass --strategy along to to rebase rebase supports --strategy, so pull should pass the option along to it. Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano --- git-pull.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'git-pull.sh') diff --git a/git-pull.sh b/git-pull.sh index 46da0f4ca..3ce32b5f2 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -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 -- cgit v1.2.1