Re:Why is git pull considered harmful? (2013)
by sergiosgc on Wednesday March 12, 2014 @12:03PM
(#7386406)
In the precise case of the bug and typo, you should probably use git commit --amend.
Anyhow, generically, while your changes are local, rewrite history to your hearts content. Have it tell a development story that makes sense. The real important part is: you can rewrite history only while it is private. When you push the commits, never ever rewrite history.
Namely, rebasing is not a replacement for merging.
Re:Why is git pull considered harmful? (2013)
by kmowery on Wednesday March 12, 2014 @12:54PM
(#7386760)
git commit --amend is rewriting history, just not very much of it. If you --amend after pushing, you run into the exact same problems mentioned before.
Anyhow, generically, while your changes are local, rewrite history to your hearts content. Have it tell a development story that makes sense. The real important part is: you can rewrite history only while it is private. When you push the commits, never ever rewrite history.
Namely, rebasing is not a replacement for merging.