diff options
| author | Avery Pennarun <apenwarr@gmail.com> | 2009-10-02 18:23:54 -0400 |
|---|---|---|
| committer | Avery Pennarun <apenwarr@gmail.com> | 2009-10-02 18:23:54 -0400 |
| commit | e31d1e2f30c943473de7a23bbbcd2dcea698e312 (patch) | |
| tree | 79d120ed537bcda8a151721d6503baf4c8c79c12 /git-commit-script | |
| parent | 2275f7077d5ea2bb9201599dec0dd8f2a5de2e40 (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.
Diffstat (limited to 'git-commit-script')
0 files changed, 0 insertions, 0 deletions