From: Yann Simon Date: Mon, 23 Feb 2009 09:32:47 GMT Subject: Re: [PATCH JGIT] Add "compare with index" action. Message-ID: <551f769b0902230132l6fd70f20xa3d59a5df6768395@mail.gmail.com> In-Reply-To: <200902221738.40753.robin.rosenberg.lists@dewire.com> 2009/2/22 Robin Rosenberg : > fredag 20 februari 2009 09:20:29 skrev Yann Simon : >> In the Compare With... menu, the "compare with index" action opens >> a diff editor that compares the workspace version of a file and its >> index version. > > The appearance in the menu is a bit odd. "Compare with" is already in the menu > context as that is the name of the menu that hold the Compare with index. So the > menu name should be really be just "Git Index". Yes, you're right. I can change the labels to: CompareWithIndexAction_label=Git Index CompareWithIndexAction_tooltip=Compare with Git's index version >> The local file can be modified and saved. >> >> The staged version can be modified and saved. This updates the index. >> For this, add methods into GitIndex to allow to specify a content >> different from the file. > > One would expect this feature to work at any level of the project, not just files. That > won't be a showstopper though. Yes of course. In that case, we would need to display a tree of modifications. That could be done in a second step. -- yann