mirror of
https://github.com/git/git.git
synced 2026-01-15 21:29:17 +00:00
cmd_pull didn't support --squash correctly.
We should implement it as git fetch ... git subtree merge ... But we were instead just calling git pull -s subtree ... because 'git subtree merge' used to be just an alias for 'git merge -s subtree', but it no longer is.
This commit is contained in:
@@ -567,8 +567,9 @@ cmd_merge()
|
||||
|
||||
cmd_pull()
|
||||
{
|
||||
ensure_clean
|
||||
set -x
|
||||
ensure_clean
|
||||
git fetch "$@" || exit $?
|
||||
revs=FETCH_HEAD
|
||||
cmd_merge
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user