[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: git-gui i18n / 0.9.x plans
From:       "Shawn O. Pearce" <spearce () spearce ! org>
Date:       2007-07-31 14:32:28
Message-ID: 20070731143228.GC20052 () spearce ! org
[Download RAW message or body]

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.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]