git-merge vs. git-log
Par Benoît Dejean le dimanche, 3 juin 2007, 22:59 - GNOME - Lien permanent
I no longer use svn directly for libgtop and system-monitor. I use git-svn instead. I no longer write ChangeLog. But i should because git-merge doesn't seem to preserve revision log. So dear lazy web, how i get the revision log of a branch including all revisions logs comming from merges ? Will it survive branch deletion. monotone propagate can do this but doesn't have a mtn-svn yet :/
Commentaires
Well, as I see it, it would be hard, because SVN per se doesn't support "real merges" (a merge is a simple patch).
Maybe you could use git-rebase, which will "re-commit" all the commits of the merged branch into the current one, thus keeping the history.
Maybe you are right, maybe git-svn is actually destroying the merge history :/
I'm not sure what you are trying to do, but have you looked at "merge.summary" in man git-config?
I don't want the summary : i would like all the revisions from a branch to be merged as they are. But instead, i can only see one big commit "Merge branch X" with a cumulative diff ...