Hi Tim! sorry for the late reply.
Depending on your situation, you want to do one or another thing.
Assumed that you have *not* pushed the stuff to somewhere (like to github):
Assuming your tree looks like this:
master --- A --- B --- C --- D --- e --- f --- [uncommitted stuff]
where A,B,C,D are commits you want to keep, and e and f are commits you
want to temporarily remove; then you can do this:
# make sure you're on the right branch!
git commit -a # commit the uncommitted stuff first
git branch midi_fixes_temporary # "copy" this branch
# you're still on midi_fixes!
git reset --hard D # rewind midi_fixes
code && git commit && repeat # make X Y and Z
this will have you end up in this:
master --- A - B - C --- D --- X --- Y --- Z <- midi_fixes
\
`--- e ---- f <- midi_fixes_temp
where X Y and Z are new commits
you can merge this some day later.
if you already have pushed your work, do this:
# make sure you're on the right branch!
git revert e..f # this will create a commit, reverting e,f, and every=
# thing in between
git branch midi_fixes_temp
git checkout midi_fixes_temp
git revert [the revert-commit you have just created]
git checkout midi_fixes
code && commit && repeat
this will give you
master --- A - B - C - D - e - f - R --- X --- Y --- Z <- midi_fixes
\
`--- S <- midi_fixes_temp
where R is the commit which reverts e and f
and S is the commit which re-applies e and f (that is, which reverts R)
tip: better check that on a test repo, or make a testing copy of muse. i
didn't test these.
cheers,
flo
Am 16.11.2013 01:13, schrieb Tim E. Real:
> I'm a bit rusty with the git stuff, I want to make sure I do it right.
> What commands do I need for this:
>
> I want to make a new branch which is a copy of my midi_fixes branch,
> called say, midi_fixes_revert, so that I can revert (remove) some of the
> 14-bit stuff I was working on and finish up the other stuff that was ready,
> then commit and push the new branch, so that days later I can merge it
> with main branch after testing and approval.
>
> Probably simple but I'm not sure.
>
> Thanks.
> Tim.
>
> ------------------------------------------------------------------------------
> DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps
> OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
> Free app hosting. Or install the open source package on any LAMP server.
> Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
> http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk
> _______________________________________________
> Lmuse-developer mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/lmuse-developer
>
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access Free app hosting. Or install the open source package on any LAMP server. Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native! http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk
_______________________________________________ Lmuse-developer mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/lmuse-developer
