From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Sep 2016 20:51:45 +0000 (-0700)
Subject: Merge branch 'sb/diff-cleanup' into maint
X-Git-Tag: v2.10.1~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ddf8ee859f0f5f94e6b6350c1edc8bf8871ce31c;p=thirdparty%2Fgit.git

Merge branch 'sb/diff-cleanup' into maint

Code cleanup.

* sb/diff-cleanup:
  diff: remove dead code
  diff: omit found pointer from emit_callback
  diff.c: use diff_options directly
---

ddf8ee859f0f5f94e6b6350c1edc8bf8871ce31c