From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Hommey Subject: Re: git show stash Date: Wed, 12 Dec 2007 08:37:28 +0100 Organization: glandium.org Message-ID: <20071212073728.GA12058@glandium.org> References: <20071212072836.GA10961@glandium.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Dec 12 08:37:52 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1J2MAB-0003dB-Cr for gcvg-git-2@gmane.org; Wed, 12 Dec 2007 08:37:51 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754369AbXLLHha (ORCPT ); Wed, 12 Dec 2007 02:37:30 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754323AbXLLHha (ORCPT ); Wed, 12 Dec 2007 02:37:30 -0500 Received: from smtp25.orange.fr ([193.252.22.22]:17983 "EHLO smtp25.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753965AbXLLHh3 (ORCPT ); Wed, 12 Dec 2007 02:37:29 -0500 Received: from me-wanadoo.net (localhost [127.0.0.1]) by mwinf2522.orange.fr (SMTP Server) with ESMTP id B13B01C00090 for ; Wed, 12 Dec 2007 08:37:28 +0100 (CET) Received: from namakemono.glandium.org (APuteaux-153-1-79-219.w81-249.abo.wanadoo.fr [81.249.109.219]) by mwinf2522.orange.fr (SMTP Server) with ESMTP id 95E2A1C00088 for ; Wed, 12 Dec 2007 08:37:28 +0100 (CET) X-ME-UUID: 20071212073728614.95E2A1C00088@mwinf2522.orange.fr Received: from mh by namakemono.glandium.org with local (Exim 4.68) (envelope-from ) id 1J2M9o-0003HM-8A for git@vger.kernel.org; Wed, 12 Dec 2007 08:37:28 +0100 Content-Disposition: inline In-Reply-To: <20071212072836.GA10961@glandium.org> X-GPG-Fingerprint: A479 A824 265C B2A5 FC54 8D1E DE4B DA2C 54FD 2A58 User-Agent: Mutt/1.5.17 (2007-11-01) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Wed, Dec 12, 2007 at 08:28:36AM +0100, Mike Hommey wrote: > Hi, > > Is there a particular reason why git show stash displays 2 signs at the > beginning of changed lines, contrary to git show anyotherref that shows > only one ? (the diff header is also different) I got a hint by opening my eyes: the stash is a merge commit (why is that so, by the way ?). Mike