<html><head><style type='text/css'>p { margin: 0; }</style></head><body><div style='font-family: times new roman,new york,times,serif; font-size: 12pt; color: #000000'>
<div class="moz-cite-prefix">Thanks Aurélien,<br>
Considering the number of commits and the size of the components
it was easier to cherry-pick one commit at a time rather than
rebase or other bulk method.<br>
<br>
<br>
So here I am with my 2 branches (Maybe I should think about naming branches) :<br>
<tt>$ git branch</tt><tt><br>
</tt><tt> libconfig</tt><tt><br>
</tt><tt> * oi/hipster</tt><tt><br>
</tt><tt> sslh</tt><br><br>
<tt>$ git show-branch --topo-order</tt><tt><br>
</tt><tt> ! [libconfig] Use of $(MACH64) in p5m file</tt><tt><br>
</tt><tt> * [oi/hipster] Add component libconfig as a requirement
for sslh</tt><tt><br>
</tt><tt> ! [sslh] Update license headers from Opensolaris to
Illumos CDDL Clean Makefile of unnecessary bits Clean p5m of
unnecessary bits p5m generated from Makefile info Patch to sslh
Makefile includes not compressed man page SMF manifest has been
stripped out of unnecessary things SMF method script has been
completely rewritten</tt><tt><br>
</tt><tt> ---- </tt><tt><br>
</tt><tt>+ [sslh] Update license headers from Opensolaris to
Illumos CDDL Clean Makefile of unnecessary bits Clean p5m of
unnecessary bits p5m generated from Makefile info Patch to sslh
Makefile includes not compressed man page SMF manifest has been
stripped out of unnecessary things SMF method script has been
completely rewritten</tt><tt><br>
</tt><tt> </tt><tt>+ [sslh^] No need to specify SMG FMRI, defined
by XML file</tt><tt><br>
</tt><tt> + [sslh~2] Remove unused commented properties</tt><tt><br>
</tt><tt> + [sslh~3] Consistency between hardcoded configuration
file lookup and method</tt><tt><br>
</tt><tt> + [sslh~4] Add component sslh</tt><tt><br>
</tt><tt> + + [libconfig] Use of $(MACH64) in p5m file</tt><tt><br>
</tt><tt> + + [libconfig^] Change license header from Opensolaris
to Illumos CDDL</tt><tt><br>
</tt><tt> + + [libconfig~2] Removed dir actions Added tabs to
aligned action parameters</tt><tt><br>
</tt><tt> + + [libconfig~3] Fixed P5M file : - build from make
sample-manifest - remove .a .la files - include 64bits files as
well</tt><tt><br>
</tt><tt> + + [libconfig~4] Add component libconfig as a
requirement for sslh</tt><tt><br>
</tt><tt> * [oi/hipster] Add component libconfig as a requirement
for sslh</tt><tt><br>
</tt><tt> +*+ [libconfig~5] Use of in p5m file</tt><tt><br>
</tt><tt>++*+ [libconfig~6] Update license headers from
Opensolaris to Illumos CDDL Clean Makefile of unnecessary bits
Clean p5m of unnecessary bits p5m generated from Makefile info
Patch to sslh Makefile includes not compressed man page SMF
manifest has been stripped out of unnecessary things SMF method
script has been completely rewritten</tt><tt><br>
</tt><br>
But I'm not sure of where I am because when I try to create a pull
request on github on a specific branch, I can see all the commit
from the other branch.<br>
Pfiuu, I have to admit that I spend more time to do git/github
stuff than actually "doing work". <br>
As Jim said, there's many schools so you can find documents out
there that through you in many various direction.<br>
<br>
Best regards.<br>
Ben<br>
<br>
On 21/03/16 12:32, Aurélien Larcher wrote:<br>
</div>
<blockquote cite="mid:CAHMq6q0DLLVpBf4DLqaZtfb+GKGpCZQLL+ySgnu_B+5FRR+h=A@mail.gmail.com">
<div dir="ltr">Hello,<br>
<br>
<div>
<div class="gmail_extra">
<div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left:1px solid
rgb(204,204,204);padding-left:1ex">Hi,<br>
<br>
I have hard time to get through the git way of doing
things right now.<br>
<br>
So, I forked oi-userland, added components or changes to
it and did a pull request.<br>
Ok, I understand that I should have done one component
at a time.<br>
</blockquote>
<div><br>
</div>
<div>Whenever there is a dependency of said component at
build time yes: PR the dependency first.<br>
</div>
<div> </div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left:1px solid
rgb(204,204,204);padding-left:1ex">
It seems that the git way of doing this is to create one
branch per component which I haven't done.<br>
<br>
Now I have all my commits in oi/hipster and how can I
reach the situation where I can pull request one
component only ?<br>
</blockquote>
<div><br>
</div>
<div>In your case it is easy because there is no
dependency between commits.<br>
</div>
<div>I would say the easiest is to create a new branch
(git checkout -b libconfig) and git cherry-pick the
commits related to libconfig.<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left:1px solid
rgb(204,204,204);padding-left:1ex">
Is branching per component the best way to make pull
request ?<br>
</blockquote>
<div><br>
</div>
<div>In general features and fixes should live in separate
branches yes and one for each component: exception is
made in case dependencies or lack thereof allow several
fixes in one PR.<br>
</div>
<div>If you think how the build server works it makes
sense.<br>
</div>
<div><br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left:1px solid
rgb(204,204,204);padding-left:1ex">
<br>
Best regards.<br>
Ben<br>
<br>
</blockquote>
</div>
</div>
</div>
</div>
</blockquote>
<br>
</div></body></html>