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:
Avery Pennarun
2009-10-02 18:23:54 -04:00
parent 2275f7077d
commit e31d1e2f30

View File

@@ -567,8 +567,9 @@ cmd_merge()
cmd_pull()
{
ensure_clean
set -x
ensure_clean
git fetch "$@" || exit $?
revs=FETCH_HEAD
cmd_merge
}