In case I need to submit patches to branch which is not parent of master, the patch should be rebased there, and I cannot merge it; I need to rebase it back and then merge from that one.
In the end, resulting commands should be like:
save hash H0
git reset --hard _branch to push_
git cherry-pick --no-edit _commit_
save hash H1
git reset --hash $H0
git cherry-pick -x --no-edit $H1 (note that the link should be there)
....
Also, the H1 should be available after, to make the push, or to reuse. Also, subsequent rebases should be able to modify the history in the pushed branch. In general, it is some place to think about. The ideal solution would be to make it all transparently, so I don't need to write all that rebases here and there in the todo.
In case I need to submit patches to branch which is not parent of master, the patch should be rebased there, and I cannot merge it; I need to rebase it back and then merge from that one.
In the end, resulting commands should be like:
Also, the H1 should be available after, to make the push, or to reuse. Also, subsequent rebases should be able to modify the history in the pushed branch. In general, it is some place to think about. The ideal solution would be to make it all transparently, so I don't need to write all that rebases here and there in the todo.