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

Re: [PATCH v3 0/3] gitweb: Optional grouping of projects by category

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:43

Sébastien Cevey [off-list ref] writes:
[1] OT: I didn't find a simple command to do this:

    $ git diff ..the-end-state > finish.patch
    $ patch -p1 < finish.patch
    $ git commit -a -s

    (where the original HEAD and the-end-state have an older MRCA with
     rewritten history inbetween, and I don't want to apply that
     history and solve conflicts, just "get my tree to the end state".)

    Any tip?
$ git read-tree -m -u the-end-state
$ git commit -a -s
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help