From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nico -telmich- Schottelius Subject: Problem with cg-update Date: Thu, 17 Nov 2005 16:16:49 +0100 Message-ID: <20051117151649.GE16963@schottelius.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="J4XPiPrVK1ev6Sgr" X-From: git-owner@vger.kernel.org Thu Nov 17 16:19:11 2005 Return-path: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EclVO-0007Dp-GE for gcvg-git@gmane.org; Thu, 17 Nov 2005 16:16:54 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751024AbVKQPQv (ORCPT ); Thu, 17 Nov 2005 10:16:51 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751031AbVKQPQv (ORCPT ); Thu, 17 Nov 2005 10:16:51 -0500 Received: from [217.14.64.54] ([217.14.64.54]:40345 "HELO hydrogenium.schottelius.org") by vger.kernel.org with SMTP id S1751001AbVKQPQv (ORCPT ); Thu, 17 Nov 2005 10:16:51 -0500 Received: (qmail 26008 invoked by uid 1000); 17 Nov 2005 15:16:49 -0000 To: GIT ML Content-Disposition: inline User-Agent: echo $message | gpg -e $sender -s | netcat mailhost 25 X-Linux-Info: http://linux.schottelius.org/ X-Operating-System: Linux 2.6.14 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: --J4XPiPrVK1ev6Sgr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hello! I tried an update which failed and then to commit which failed [0]. Could someone tell me what would be the correct way now? Nico [0]: The log: http://creme.schottelius.org/~nico/linux/debug/git/update-local_changes_com= mit --=20 Latest project: cinit-0.2.1 (http://linux.schottelius.org/cinit/) Open Source nutures open minds and free, creative developers. --J4XPiPrVK1ev6Sgr Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) iQIVAwUBQ3ye4LOTBMvCUbrlAQK7IQ//Xrbiq/iRnoxA0iFzpB7z2G5paHHir7mD yQohp4XulUrkDhe/IWD92bAXS5aO60e6iE00SmJxgwOteROHuNJ5AahRhFll5CUL qjqCgbUfhUBRn+5ixD/CWe/rJWk9C6ac9EZbHvzdFdaz0KOTMoj0AuhRFumF+1D9 EJeEdwzkHF7vdB14iVfvzWjPSiaJqSN1lh6kj+exWR3GnR/S9K2za5YK09MoCbWK YTSb371BINl7Fe00gzZLdcjaNpWKAGsYFRmWRHFITH5g5dbhXew22WcR6l/VFK0M DiwEVG1NGmwHtYj3PEqHxlZENT3WCmeKtJfswqYw/SiWVjBnOUgItyULLz3Uxkle kDPZ1k1gMpA7pXwtj5hbjoTS5RELZtstcE9YvhB2P3jKOZTNP8x/LVRfUsu3W/NI zKOcFcF2/UVh60rVnCnY4nV1blkQvWpnr1EBsPeKB+6uc1UriiOmx1xT9rDnfp0d XykYaeMQgmCtLZI6wrV8Y0p2yMBTqptkZAvF/USpdtlFpNVbIX0iva8XGZ3+vz7b Z9jhxO9SrDDeBoA9b623paatUGfaFAmrCeXdZ/llAw2/xC/giGxGxvDC7Q5XSV0+ CaakchJJr7bhwv941rAKzbLevko96tcwSmMAAB4F0qLDUT8iG7xmuLY2CG3zP66R FsnKsw3lHwY= =ZSCQ -----END PGP SIGNATURE----- --J4XPiPrVK1ev6Sgr--