From mboxrd@z Thu Jan 1 00:00:00 1970 From: Petr Baudis Subject: Re: Merge with git-pasky II. Date: Thu, 14 Apr 2005 02:30:45 +0200 Message-ID: <20050414003045.GV25711@pasky.ji.cz> References: <20050414002902.GU25711@pasky.ji.cz> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Apr 14 02:27:49 2005 Return-path: Received: from vger.kernel.org ([12.107.209.244]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DLsCo-0005Wn-Cn for gcvg-git@gmane.org; Thu, 14 Apr 2005 02:27:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261379AbVDNAaw (ORCPT ); Wed, 13 Apr 2005 20:30:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261400AbVDNAaw (ORCPT ); Wed, 13 Apr 2005 20:30:52 -0400 Received: from w241.dkm.cz ([62.24.88.241]:27066 "HELO machine.sinus.cz") by vger.kernel.org with SMTP id S261379AbVDNAaq (ORCPT ); Wed, 13 Apr 2005 20:30:46 -0400 Received: (qmail 3658 invoked by uid 2001); 14 Apr 2005 00:30:45 -0000 To: torvalds@osdl.org Content-Disposition: inline In-Reply-To: <20050414002902.GU25711@pasky.ji.cz> User-Agent: Mutt/1.4i X-message-flag: Outlook : A program to spread viri, but it can do mail too. Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Dear diary, on Thu, Apr 14, 2005 at 02:29:02AM CEST, I got a letter where Petr Baudis told me that... > Its main contents are all of my shell scripts. Apart of that, some > tiny fixes scattered all around can be found there, as well as some > patches which went through the mailing list. My last merge with you > concerned your commit 39021759c903a943a33a28cfbd5070d36d851581. > > It's again > > rsync://pasky.or.cz/git/ > > this time my HEAD is fba83970090ef54c6eb86dcc2c2d5087af5ac637. I forgot to add that after merging, you will probably want to change the VERSION file (to contain whatever you want). -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor