Re: Bizarre git merge behaviour

2013-11-20 Thread Matthew Cengia
d why the problem occured, which puts my mind at ease. Thanks again for all your help. -- Regards, Matthew Cengia signature.asc Description: Digital signature

Re: Bizarre git merge behaviour

2013-11-20 Thread Matthew Cengia
needles and haystacks... > > Sorry, I don't know how to help you further. No worries, thanks very much for your help so far nonetheless. -- Regards, Matthew Cengia signature.asc Description: Digital signature

Re: How to put tree into index

2013-11-20 Thread Matthew Cengia
On 2013-11-20 15:47, Alexander GQ Gerasiov wrote: [...] > So my question is > How to put into index tree-object with known sha1 and given name? I was just reading about something very similar in the Git book: http://git-scm.com/book/en/Git-Internals-Git-Objects#Tree-Objects (read the entire Tree O

Re: Bizarre git merge behaviour

2013-11-20 Thread Matthew Cengia
about 90% sure I ended up with the correct result, but it'd be nice to have had the merge do the right thing in the first place, and I obviously want to avoid having to do this again in a few months' time. -- Regards, Matthew Cengia signature.asc Description: Digital signature

Bizarre git merge behaviour

2013-11-19 Thread Matthew Cengia
M ppcadm/templates/user.tpl D ppcadm/templates/wwwfilter.tpl M pre-install.sh M tca/parts.d/pxelinux-cfg ?? old/ ?? paste mattcen@sonar:prisonpc(wtf)$ - -- Regards, Matthew Cengia -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) iQJ8BAEBCgBmBQJSjDFAXxSAAA