From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernt Hansen Subject: Re: Git cheat sheet Date: Thu, 30 Aug 2007 00:05:47 -0400 Message-ID: <87k5rdbrat.fsf@totally-fudged-out-message-id> References: <200708290348.02853.zack@kde.org> <7vfy22squc.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Zack Rusin , git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Thu Aug 30 06:06:25 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1IQbIT-0000C4-Uo for gcvg-git@gmane.org; Thu, 30 Aug 2007 06:06:22 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750845AbXH3EF5 (ORCPT ); Thu, 30 Aug 2007 00:05:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750790AbXH3EF5 (ORCPT ); Thu, 30 Aug 2007 00:05:57 -0400 Received: from outbound.mailhop.org ([63.208.196.171]:1470 "EHLO outbound.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750741AbXH3EF4 (ORCPT ); Thu, 30 Aug 2007 00:05:56 -0400 X-Greylist: delayed 16095 seconds by postgrey-1.27 at vger.kernel.org; Thu, 30 Aug 2007 00:05:56 EDT Received: from cpe000102d0fe75-cm0012256ecbde.cpe.net.cable.rogers.com ([74.119.210.211] helo=mail.norang.ca) by outbound.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1IQbI2-0002WW-U1; Thu, 30 Aug 2007 00:05:55 -0400 X-MHO-User: U2FsdGVkX18aFtn9sizd0DZTJXxmOorA X-MHO-User: U2FsdGVkX1/zFvuLM9Mhx6LWENoTjBdB X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 74.119.210.211 X-Report-Abuse-To: abuse@dyndns.com (see http://www.mailhop.org/outbound/abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX18YC0uSbtIxfrBQ4TSvAEop Received-SPF: none (mail.norang.ca: bernt@gollum.intra.norang.ca does not designate permitted sender hosts) receiver=mail.norang.ca; client-ip=192.168.1.5; helo=gollum.intra.norang.ca; envelope-from=bernt@gollum.intra.norang.ca; x-software=spfmilter 0.97 http://www.acme.com/software/spfmilter/ with libspf-unknown; Received: from gollum.intra.norang.ca (gollum.intra.norang.ca [192.168.1.5]) by mail.norang.ca (8.13.8/8.13.8/Debian-3) with ESMTP id l7U45qXh007687 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 30 Aug 2007 00:05:53 -0400 Received: from gollum.intra.norang.ca (localhost [127.0.0.1]) by gollum.intra.norang.ca (8.13.8/8.13.8/Debian-3) with ESMTP id l7U45lKL005495; Thu, 30 Aug 2007 00:05:47 -0400 Received: (from bernt@localhost) by gollum.intra.norang.ca (8.13.8/8.13.8/Submit) id l7U45lv7005494; Thu, 30 Aug 2007 00:05:47 -0400 In-Reply-To: <7vfy22squc.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Wed\, 29 Aug 2007 01\:11\:07 -0700") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Junio C Hamano writes: > Zack Rusin writes: > >> http://ktown.kde.org/~zrusin/git/git-cheat-sheet.svg > > Nice drawing and no typo. Very nicely done. > One typo: Title "To view the merge conclicts" under Resolve Merge Conflicts. Nice job :) -Bernt