From mboxrd@z Thu Jan 1 00:00:00 1970 From: Enrico Weigelt Subject: Re: merging bare repository Date: Fri, 13 May 2011 22:56:47 +0200 Message-ID: <20110513205646.GD24644@nibiru.local> References: <533718318.20110513145132@gmail.com> <20110513135348.GB10857@jpl.local> Reply-To: weigelt@metux.de Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Jul 24 05:44:36 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QkpcJ-0002No-4K for gcvg-git-2@lo.gmane.org; Sun, 24 Jul 2011 05:44:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752272Ab1GXDoa convert rfc822-to-quoted-printable (ORCPT ); Sat, 23 Jul 2011 23:44:30 -0400 Received: from caprica.metux.de ([82.165.128.25]:32816 "EHLO mailgate.caprica.metux.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752209Ab1GXDo2 convert rfc822-to-8bit (ORCPT ); Sat, 23 Jul 2011 23:44:28 -0400 Received: from mailgate.caprica.metux.de (localhost.localdomain [127.0.0.1]) by mailgate.caprica.metux.de (8.14.4/8.14.4) with ESMTP id p6O0G8Kf021260 for ; Sun, 24 Jul 2011 02:19:41 +0200 Received: (from uucp@localhost) by mailgate.caprica.metux.de (8.14.4/8.14.4/Submit) with UUCP id p6NNBG6t031504 for git@vger.kernel.org; Sun, 24 Jul 2011 01:11:16 +0200 Received: (from weigelt@localhost) by nibiru.metux.de (8.12.10/8.12.10) id p4DKulJC008852 for git@vger.kernel.org; Fri, 13 May 2011 22:56:47 +0200 Mail-Followup-To: git@vger.kernel.org Content-Disposition: inline In-Reply-To: <20110513135348.GB10857@jpl.local> User-Agent: Mutt/1.4.1i X-Terror: bin laden, kill bush, Briefbombe, Massenvernichtung, KZ, X-Nazi: Weisse Rasse, Hitlers Wiederauferstehung, 42, X-Antichrist: weg mit schaeuble, ausrotten, heiliger krieg, al quaida, X-Killer: 23, endloesung, Weltuntergang, X-Doof: wer das liest ist doof Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: * Magnus B=E4ck wrote: BTW: if you're ontop of some external upstream, you might like to rebase instead of merge. cu --=20 ---------------------------------------------------------------------- Enrico Weigelt, metux IT service -- http://www.metux.de/ phone: +49 36207 519931 email: weigelt@metux.de mobile: +49 151 27565287 icq: 210169427 skype: nekrad666 ---------------------------------------------------------------------- Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme ----------------------------------------------------------------------