Thread (23 messages) 23 messages, 7 authors, 2016-06-15

Re: What's cooking in git.git (Nov 2010, #03; Wed, 24)

flat view

From: Johannes Sixt <hidden>
Date: 2016-06-15 22:50:06

Am 11/25/2010 10:45, schrieb Ævar Arnfjörð Bjarmason:
On Thu, Nov 25, 2010 at 04:16, Junio C Hamano [off-list ref] wrote:
quoted
It is getting ridiculously painful to keep re-resolving the conflicts with
other topics in flight, even with the help with rerere.

Needs a bit more minor work to get the basic code structure right.
Still waiting on input about what exactly needs to be fixed. See
<AANLkTikw0+FGJmj7C0B9J_3ZVXrbqCw+UzyP3sqfyVdm@mail.gmail.com.

Is there anything else than that (the builtin.h includes) that you
think needs work?
One open question was why you do not want to move 'LIB_OBJS += gettext.o'
away from the LIB_OBJS section down to the configuration evaluation
section, i.e., why gettext.o would be different from block-sha1/sha1.o.

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