projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2275f70) | patch
cmd_pull didn't support --squash correctly.
authorAvery Pennarun <apenwarr@gmail.com>
Fri, 2 Oct 2009 22:23:54 +0000 (18:23 -0400)
committerAvery Pennarun <apenwarr@gmail.com>
Fri, 2 Oct 2009 22:23:54 +0000 (18:23 -0400)
commite31d1e2f30c943473de7a23bbbcd2dcea698e312
tree79d120ed537bcda8a151721d6503baf4c8c79c12tree | snapshot
parent2275f7077d5ea2bb9201599dec0dd8f2a5de2e40commit | diff
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.
git-subtree.sh diff | blob | history
Git—the stupid content tracker