> And another warning: the complete history issue also affects personal > git branches on gitorious. So, if an a/c designer adds 19 versions of an > image file to his private branch and then placed a "merge request" to > fgdata/master - then the merge will actually copy the history of all 19 > file versions to the master branch - even the history of files which > were already dropped on the private branch. So, in such cases it's a > good idea to not actually "git merge" the complete personal branch to > our "master" - but to simply take a copy of the latest version of the > a/c files and to submit them to "master" using a fresh commit (I think > that's what our fgdata-merge-committers do anyway - at least I hope > so...). Or maybe any git expert knew if there was a > git-merge-without-history command?
You can merge a branch using one commit with git merge --squash <branch_to_merge> git commit The merge --squash applies the changes from all the commits to the current branches working tree and stages them. It also creates a commit message that concatenates all the commit messages for the ones that are being merged. git commit then allows you to edit that message (and commit of course). Basically it does exactly what you're after :) Cheers, Luuk ------------------------------------------------------------------------------ Colocation vs. Managed Hosting A question and answer guide to determining the best fit for your organization - today and in the future. http://p.sf.net/sfu/internap-sfd2d _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
