On 1 June 2011 21:13, Jarl Friis <j...@softace.dk> wrote: > Chris Browet <c...@semperpax.com> writes: > >> 1. (*) text/plain ( ) text/html >> >> Hi, >> >> The prefered way is to create merge requests in gitorious. >> Although I'm not familiar with creating them personally, it is super easy >> for merging AND keep the original hashes. >> >> Please have a look at the gitorious doc to create them. > > OK, so I figured it out... > > I have created a merge request. Unfortunately I didn't find a way to > make a merge request for the two commits seperately.
A merge pulls in everything before the commit you merge (that's the only way to keep the id, since the id is a cryptographic sum dependent on the entire history of the commit), so if you want to have a merge request with only a couple of commits on it, you need to put them on a separate branch and do a merge request for the branch. You could for example move your existing commits to a new branch like this: git checkout -b mr/my_feature master git cherry-pick <git-id-of-commit> and then push and request a merge of mr/my_feature. Cheers James > > The one commit regarding Fugro imagery you will probably merge. The > other one regarding include path you will probably like to discuss. > > Anyway I consider the Fugro imagery patch relevant for 0.16-fixes and > 0.17-fixes as well. > > Jarl > > -- > Jarl Friis > Softace ApS > Rådhustorvet 7, 2. sal > 3520 Farum > Phone: +45 26 13 20 90 > E-mail: j...@softace.dk > LinkedIn: www.linkedin.com/in/jarlfriis > > > _______________________________________________ > Merkaartor mailing list > Merkaartor@openstreetmap.org > http://lists.openstreetmap.org/listinfo/merkaartor > -- James Hogan _______________________________________________ Merkaartor mailing list Merkaartor@openstreetmap.org http://lists.openstreetmap.org/listinfo/merkaartor
