Thread (1 message) 1 message, 1 author, 2016-06-15

Re: Patch (apply) vs. Pull

From: Catalin Marinas <hidden>
Date: 2016-06-15 22:42:00

Daniel Barkalow [off-list ref] wrote:
I think that it's important to avoid having the array of "rebased the
patch" commits be reachable from the final series if that series is going
to be merged into the mainline at the end.
True. I will remove that. Any commit will have the new base of the
patch as a parent.
If you want to keep the history of a patch, you should be able to do it by
rebasing that history as well as the latest patch, so you'd get a
two-parent commit with two rebased parents when you rebased a two-parent
commit.
I can have two commits, one of them accessible via HEAD and the other
stored somewhere under .git/patches. The latter is just a normal
commit where the parent is the current HEAD. This will not be
generated when the patch is re-based, but only when a patch is
modified.

-- 
Catalin
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help