[FFmpeg-devel] Who is against GIT now?
Mon Apr 6 11:48:24 CEST 2009
On Mon, Apr 6, 2009 at 12:34 PM, Olivier Galibert <galibert at pobox.com> wrote:
> On Sun, Apr 05, 2009 at 11:06:48PM -0700, Jason Garrett-Glaser wrote:
>> The main problem with forcing updates to the main branch (as discussed
>> a few times previously) to retroactively edit past commits is that it
>> makes hell with everyone's local trees.
>> How much of that, however, applies if git push -f is *only* used for
>> commit message changes, thus not breaking any local changes?
> Doesn't change a thing. ?The commit message is part of the commit
> identity (the sha1). ?The problem of rebase/--amend/etc is that it
> creates a new commit "sideways", without any link to the original
> version. ?So when someone with the original version does a git pull
> the system does not know to substitute the new commit instead and go
> from there. ?In short "rebases are not tracked", so you can't update
> your tree automatically when rebases happened.
Yeah, but the sha1 of the trees don't change, and git is smart enough
to figure that out when you rebase:
git pull --rebase
More information about the ffmpeg-devel