undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmd_pull didn't support --squash correctly.

Browse Source 
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
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-subtree.sh
View File

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