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

Re: non-empty index with git commit -a

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:50:34

Jakub Narebski [off-list ref] writes:
quoted
So I think we are really on the same page. :)
Also it would be not as easy as reflogs - you would have either to save
copy of index, or create a tree out of it and save reference in reflog.
Also note that "Create a tree out of it" is not always a useful way to
save the state of the index.  The "stash" shares the same issue, but you
would need an equivalent of a tarball that consists of the index file
(with conflicted state) and the files in the working tree that corresponds
to index entries with conflicted states if you want to be useful for
storing a state away in case you botch the conflict resolution you are
attempting.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help