With git, you can rewind time and find a different point to branch off your second branch.
I imagine you have some structure like this:
sysiphus/master perl/blead
| |
... patches ... other patches
| |
| /
+----------------/ <- here is where you branched off your change
+s, for example SHA 12abcd
|
The easiest way is to then check out the point where you diverged from blead</>, create a new branch and apply your changes to <c>win32/makefile.mk there:
git checkout 12abcd
# check that we can build at this stage, make sure that you have all y
+our changes out of tree, just in case:
git clean -dfX && cd win32 && gmake test
# Create the new branch here, and check it out
git branch makefile-update
git checkout makefile-update
... apply your changes
# check that tests still pass
git clean -dfX && cd win32 && gmake test
git commit -m "voila"
git push github
-
Are you posting in the right place? Check out Where do I post X? to know for sure.
-
Posts may use any of the Perl Monks Approved HTML tags. Currently these include the following:
<code> <a> <b> <big>
<blockquote> <br /> <dd>
<dl> <dt> <em> <font>
<h1> <h2> <h3> <h4>
<h5> <h6> <hr /> <i>
<li> <nbsp> <ol> <p>
<small> <strike> <strong>
<sub> <sup> <table>
<td> <th> <tr> <tt>
<u> <ul>
-
Snippets of code should be wrapped in
<code> tags not
<pre> tags. In fact, <pre>
tags should generally be avoided. If they must
be used, extreme care should be
taken to ensure that their contents do not
have long lines (<70 chars), in order to prevent
horizontal scrolling (and possible janitor
intervention).
-
Want more info? How to link
or How to display code and escape characters
are good places to start.
|