I have configured oXygen diff as a diff tool in Git with [difftool "oxygen"] cmd = \"/Applications/oXygen XML Editor 15.0/diffFilesMac.sh\" \"$LOCAL\" \"$REMOTE\" prompt = false [diff] tool = oxygen And when I run e.g. git difftool src/main/plugins/org.dita.htmlhelp/build_dita2htmlhelp.xml It launches oXygen diff. J On 22 Aug, 2013, at 0:04, Eliot Kimber <ekimber@rsicms.com> wrote:

I've started using Git for version control wherever possible.

Looking at the help, it looks like there is support for SVN version diffing, but nothing for Git.

Have you considered providing at least Git-aware differencing, if not a full Git client analogous to the SVN client?

Cheers,

E.

-- Eliot Kimber Senior Solutions Architect, RSI Content Solutions "Bringing Strategy, Content, and Technology Together" Main: 512.554.9368 www.rsicms.com www.rsuitecms.com Book: DITA For Practitioners, from XML Press, http://xmlpress.net/publications/dita/practitioners-1/

_______________________________________________ oXygen-user mailing list oXygen-user@oxygenxml.com http://www.oxygenxml.com/mailman/listinfo/oxygen-user

Hi Eliot, As you've observed, Oxygen bundles an SVN Client, not just an SVN diff tool. If we were to provide Git support, it would probably be an entire Git client, not just the diff tool. As much as we would like to also provide support for Git, at this time we feel we should concentrate our resources on XML related features. Regards, Adrian Adrian Buza oXygen XML Editor and Author Support Tel: +1-650-352-1250 ext.202 Fax: +40-251-461482 support@oxygenxml.com http://www.oxygenxml.com On 22.08.2013 00:04, Eliot Kimber wrote:

I've started using Git for version control wherever possible.

Looking at the help, it looks like there is support for SVN version diffing, but nothing for Git.

Have you considered providing at least Git-aware differencing, if not a full Git client analogous to the SVN client?

Cheers,

E.