My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 644daa9 e5c2909)
Merge branch 'jk/add-i-custom-diff-algo'
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:30:07 +0000 (14:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:30:07 +0000 (14:30 -0700)
* jk/add-i-custom-diff-algo:
  add -i: add extra options at the right place in "diff" command line
  add--interactive: respect diff.algorithm


Trivial merge
The core git plumbing