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

Re: [PATCH 10/18] revert: Save data for continuing after conflict resolution

From: Ramkumar Ramachandra <hidden>
Date: 2016-06-15 22:51:41

Hi again,

Jonathan Nieder writes:
Ramkumar Ramachandra wrote:
quoted
That these two files alone are not enough to implement a "--continue"
that remembers the command-line options specified; later patches in
the series save them too.
Micronit: I think this sentence has an extra "That".
Ugh.  Fixed.
quoted
+pristine_detach () {
+     git checkout -f "$1^0" &&
+     git read-tree -u --reset HEAD &&
+     git clean -d -f -f -q -x
+}
Nit: probably best to include the "rm -rf .git/sequencer" in this
function.  But I don't think that should hold up the patch.
Ah, good idea.  Fixed.

Thanks.

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