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

Re: [PATCH v2 1/2] rebase -i: support --root without --onto

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:54:11

Chris Webb [off-list ref] writes:
+		# Set the correct commit message and author info on the
+		# sentinel root before cherry-picking the original changes
+		# without committing (-n).  Finally, update the sentinel again
+		# to include these changes.  If the cherry-pick results in a
+		# conflict, this means our behaviour is similar to a standard
+		# failed cherry-pick during rebase, with a dirty index to
+		# resolve before manually running git commit --amend then git
+		# rebase --continue.
Thanks; very readable and understandable.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help