Jakub Narebski <jnareb@xxxxxxxxx> writes: > I have StGIT branch with no patches applied: all patches are on stack. > I have accidentally added git commit on top of StGIT branch head. > I tried to use "stg assimilate" to turn this commit into StGIT commit, > applied, but new version of StGIT has only "stg repair". And the > sequence If you have no patches, there is nothing to assimilate or repair. Your patch stack is considered to be on top of your new commit, so if you push a patch it will appear on top of the commit you just created. To turn your new commit into a patch, use "stg uncommit". > # stg repair > # stg rebase origin > > made me lose this git commit (well, up to reflog of course). This should > not happen! Why assimilate got removed? repair does exactly what assimilate did in this case, so it would not have helped you. -- David Kågedal - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
