Harvard Business School of Echec - Tag - subversion - Commentaires

git-merge vs. git-log - Benoît Dejean

Benoît Dejean — Mon, 04 Jun 2007 21:11:26 +0200

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 ...

git-merge vs. git-log - Peter

Peter — Mon, 04 Jun 2007 13:42:05 +0200

I'm not sure what you are trying to do, but have you looked at "merge.summary" in man git-config?

git-merge vs. git-log - Benoît DEJEAN

Benoît DEJEAN — Mon, 04 Jun 2007 09:48:32 +0200

Maybe you are right, maybe git-svn is actually destroying the merge history :/

git-merge vs. git-log - S.F.

S.F. — Mon, 04 Jun 2007 00:01:08 +0200

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.