зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
eb7a2f1d50
Коммит
0d2dd191cd
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче