diff options
| author | Jay Soffian <jaysoffian@gmail.com> | 2008-02-22 19:52:29 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-22 21:44:46 -0800 |
| commit | 0d2dd191cdfa3f1795c4df60a5cfb0f7e58c097a (patch) | |
| tree | b133597b00031c3b0ee701d257570565c3a58640 /git-pull.sh | |
| parent | eb7a2f1d50ca8620b087dd2751d0fe2505e7974f (diff) | |
| download | git-0d2dd191cdfa3f1795c4df60a5cfb0f7e58c097a.tar.gz git-0d2dd191cdfa3f1795c4df60a5cfb0f7e58c097a.tar.xz | |
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>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 3 |
1 files changed, 2 insertions, 1 deletions
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 |