[FFmpeg-devel] [Ffmpeg-devel] SVN dump
Tue May 1 22:42:37 CEST 2007
On Tue, 2007-05-01 at 21:57 +0200, Michael Niedermayer wrote:
> as can be seen git properly merged the later change to "test" it didnt just
> recommit it with a new date, also:
If you use "git cherry-pick" that does create a new commit for the
change. It just uses the same commit message and timestamp by default
(equivalent to using the "-c" flag to commit, and you can change those
if you want).
> shows that the bad change is properly removed
Note that what you're doing here is basically building a new
repository/branch from scratch with a different history. You can't
remove a "bad" part of history in an existing branch. This is similar to
rebuilding a repository in svn.
Now easy "rebuilds" to create a revised version of history are more
useful with git because you can have private or semiprivate branches
with history containing several commits, and then rebuild the history
before committing it to a more public repository. However if you modify
already existing history like that in a public repository it will break
all existing checkouts (basically you're removing the existing branch
and replacing it with a different one with the same name).
More information about the ffmpeg-devel