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

Re: More merge questions (why doesn't this work?)

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

Sven Verdoolaege [off-list ref] writes:
quoted
3. It does not matter; nobody types that command by hand.
I should have said "nobody should need to type that, otherwise
fix your Porcelain".
I do.  git commit won't let me commit an empty tree, or at
least I haven't figured out how to make it do that.
You are right, at least for the initial commit (for subsequent
commits it happily commits an empty tree).

Now why anybody would want to it is a different matter.  Is it
because you would want to record that your project started from
scratch, as opposed to some import from an existing non
versioned (or versioned by another SCM) working tree?
I also used it when, after resolving a merge initiated by
cg-merge, cogito (or at least the version I had installed
at the time) wouldn't let me commit it because a new file
I had pulled in contained non-ascii characters in its name.
That sounds like a simple Porcelain bug and I hope neither
Cogito or git wouldn't have that problem now.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help