From: Shawn O. Pearce <spearce@spearce.org>
Date: Tue, 31 Jul 2007 14:32:28 GMT
Subject: Re: git-gui i18n / 0.9.x plans
Message-ID: <20070731143228.GC20052@spearce.org>
In-Reply-To: <1E593130-7BBC-488D-88A5-2E16D68614A6@yahoo.ca>

Jean-Fran??ois Veillette <jean_francois_veillette@yahoo.ca> wrote:
> Le 07-07-30 à 21:28, Shawn O. Pearce a écrit :
> > - UI for cherry-pick/revert
> > - Hunk splitting/selection
> 
> It would be nice to use the configured external merge tool (git  
> mergetool) to help here (in my case os-x:opendiff/FileMerge).
> Having a visual diff between
> - the repository and the index
> - the index and the workarea
> - the repository and the workarea

Hmm.  According to the manual[1]:

   opendiff file1 file2 [-ancestor ancestorFile] [-merge mergeFile]

what should be the file1/file2/ancesorFile here?

Another problem is this paragraph:

  opendiff exits immediately after the comparison request has been
  sent to FileMerge.

Uhhhh...  how does git-gui know the user is done and the mergeFile
should be staged?

I'm also on OS X (its my primary development system for git-gui)
so I might consider working on this, but after looking at the
manpage I'm not so sure...


[1] http://developer.apple.com/documentation/Darwin/Reference/ManPages/man1/opendiff.1.html

-- 
Shawn.