Oct 252013
 

A cool bit of CLI trickery that James Humphrey shared with me. This allows you to use IDEA for diffing and merging via git’s mergetool and difftool commands.

First, add IDEA to your path (everything is in Mac-speak here):

Bash

Fish

Next, add these lines to your ~/.gitconfig file:

That’s it. Now you can use IDEA to diff and merge from git CLI like this:

  5 Responses to “Using IDEA for Git merging and diffing”

  1. Great, thanks for the tip. I think in the Bash config you may want to set PATH=$INTELLIJ_HOME $PATH

  2. Hi. Do you have an example of how to setup idea for merging and diffing on windows?

  3. , Personas pertenecientes a otras disciplinas que estén interesados por conocer las Humanidades Digitales y acercarse a un tipo de trabajo interdisciplinar y muy actual.

  4. Pretty portion of content. I just stumbled upon your website and in accession capital to assert
    that I get in fact enjoyed account your weblog posts.
    Any way I’ll be subscribing to your augment and even I fulfillment you access
    consistently rapidly.

 Leave a Reply

(required)

(required)

You may use these HTML tags and attributes: <a href="" title=""> <abbr title=""> <acronym title=""> <b> <blockquote cite=""> <cite> <code class="" title="" data-url=""> <del datetime=""> <em> <i> <q cite=""> <s> <strike> <strong> <pre class="" title="" data-url=""> <span class="" title="" data-url="">