Question

Here's the situation...

I need to be able to rebase a git repository branch to a point in time, then remove (and stash or keep) my commits beyond that point in time. Retaining the ability to re-apply every thing... but not having them living in the remote repository...

Reason (maybe you'll have a better solution)

Have a contract job that I've been working on for a few months, and they are refusing to pay... I want to be able to rewind the repo to the beginning of my involvement, remove ( and store) my work to be re-applied on payment..

The complicated issue is that there have been other users committing in tandem and I don't want to remove those, but it will obviously break if I yank intermittent commits and attempt to run the repo at the same point (not-rewinding the active copy).

Ideas? (Technical) ... Thought about using a git patch?

Was it helpful?

Solution

Create a remote tracking 'paid' branch (could be the master branch) and some feature (hostage) branches. As soon as you get your money, you rebase your features onto the paid branch and push it to your client.

Licensed under: CC-BY-SA with attribution
Not affiliated with StackOverflow
scroll top