From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shawn Pearce Subject: Re: [PATCH] annotate: Support annotation of files on other revisions. Date: Mon, 6 Mar 2006 01:32:54 -0500 Message-ID: <20060306063254.GE26820@spearce.org> References: <20060305111334.GB23448@c165.ib.student.liu.se> <440B751F.5000801@michonline.com> <46a038f90603051629ke34a0a6u89dad995bbd777b0@mail.gmail.com> <20060306024353.GA23001@mythryan2.michonline.com> <440BC92E.4060306@gmail.com> <440BCB67.4070406@michonline.com> <20060306055036.GB26820@spearce.org> <7vpsl0ayij.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-From: git-owner@vger.kernel.org Mon Mar 06 07:33:08 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FG9HD-0000z3-Pr for gcvg-git@gmane.org; Mon, 06 Mar 2006 07:33:04 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751708AbWCFGc7 (ORCPT ); Mon, 6 Mar 2006 01:32:59 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751691AbWCFGc7 (ORCPT ); Mon, 6 Mar 2006 01:32:59 -0500 Received: from corvette.plexpod.net ([64.38.20.226]:49361 "EHLO corvette.plexpod.net") by vger.kernel.org with ESMTP id S1751333AbWCFGc6 (ORCPT ); Mon, 6 Mar 2006 01:32:58 -0500 Received: from cpe-72-226-60-173.nycap.res.rr.com ([72.226.60.173] helo=asimov.home.spearce.org) by corvette.plexpod.net with esmtpa (Exim 4.52) id 1FG9H6-0004JA-Nn for git@vger.kernel.org; Mon, 06 Mar 2006 01:32:56 -0500 Received: by asimov.home.spearce.org (Postfix, from userid 1000) id 0F8FE20FBAC; Mon, 6 Mar 2006 01:32:55 -0500 (EST) To: git@vger.kernel.org Content-Disposition: inline In-Reply-To: <7vpsl0ayij.fsf@assigned-by-dhcp.cox.net> User-Agent: Mutt/1.5.11 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - corvette.plexpod.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [0 0] / [47 12] X-AntiAbuse: Sender Address Domain - spearce.org X-Source: X-Source-Args: X-Source-Dir: Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Junio C Hamano wrote: > Shawn Pearce writes: > > > git-diff Makefile > > git-diff HEAD Makefile > > > > ? (Which is rather ugly as what if you have a tracked file actually > > called HEAD and you want the first form when the commit-ish is > > omitted.) So accepting an optional commit-ish before the filename > > would be in line with what git-diff accepts today. > > The use of "start of filelist" marker "--" is optional when > unambiguous, and that is why "git-diff Makefile" works. To view > the change you still haven't update-index'ed to the path called > "HEAD", you would naturally say "git-diff -- HEAD" Naturally. :-) After getting along fine with `git-diff foo` for months I would natually not be surprised when `git-diff foo` didn't work because I performed a `git-checkout -b foo pu` one day. -- Shawn.