gittup/tup — comment on commit cbf45331961ef4614343d14d6288cab5826be74b
File:  line 0
By gittup:

I normally do 'git commit --amend', but in this case it only amended
the merge-commit, and not the original commit (since I had other
changes on master that I hadn't pushed yet). I'm not sure why I didn't
go with 'rebase -i' as that seems to do what I want (and I use it
fairly regularly). I think I was convinced that there was a git-merge
option that would do what I want, and --squash seemed to get the
result even though the commit message it produced was bizarre. Next
time I'll just stick with 'rebase -i'!

Thanks,
-Mike

On Sun, Dec 11, 2011 at 2:05 AM, Anatol

wrote:
> BTW you can change history without squashing. I recommend to use either "git rebase -i" or "git commit --amend" for it.
>
> ---
> Reply to this email directly or view it on GitHub:
> https://github.com/gittup/tup/commit/cbf45331961ef4614343d14d6288cab5826be74b#commitcomment-784704