Thread (3 messages) flat view 3 messages, 2 authors, 2016-06-15

Re: [PATCH 7/7] Add an optional limit to git-rebase

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:16

Yann Dirson [off-list ref] writes:
This patch adds a limit to restrict the list of patches to rebase.

This is useful when a set of patches were done against a given head,
but needs to be ported to a different head, as opposed to being ported
to a descendant of the original head.  In such a case we only want to
port our own patches, not those that make the two branches different
upstream.
This usage makes sense, independent from your git-format-patch
"limit" patch.  The patched argument to git-format-patch does
not match your git-format-patch changes AFAICT ;-).
-git-format-patch -k --stdout --full-index "$other" ORIG_HEAD |
+git-format-patch -k --stdout --full-index "$other" ORIG_HEAD $limit |
If all you want to do is to move the cut-off point more recent
than the merge base is, how about (without your git-format-patch
changes) doing something stupid like this instead?

  git-format-patch -k --stdout --full-index ${limit:-"$other"} ORIG_HEAD
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help