Is it possible to configure git diff to respect indentation and syntax?
I am not talking about ignoring indentation and spaces, but rather to use blank lines, indentation levels and possibly brackets, to help matching the old lines to new lines.

E.g. git diff often cuts through functions and their docblock, like this:


     class C {
     
       /**
    +   * Goes to the bar.
    +   */
    +  function bar() {
    +    return &#39;bar&#39;;
    +  }
    +
    +  /**
        * Gets your foo up to date.
        */
       function foo() {

When I would prefer

     class C {
    +
    +  /**
    +   * Goes to the bar.
    +   */
    +  function bar() {
    +    return &#39;bar&#39;;
    +  }
     
       /**
        * Gets your foo up to date.
        */
       function foo() {

In this example it is still quite harmless, but there are examples where functions and their docblock are really ripped apart due to the greedy and naive diff implementation.

Note: I already configured `*.php diff=php` in `~/.gitattributes`.

EDIT: Another example:
Here git diff mixes a property docblock with a method docblock:

       /**
    -   * @var int
    +   * @param string $str
        */



All Semantic Diff Solutions on Gang of Coders

Total of 1 Semantic Diff Solutions

git diff algorithm that does not rip functions apart? (language-aware diff)