From: Junio C Hamano Date: Mon, 27 Jan 2014 18:45:02 +0000 (-0800) Subject: Merge branch 'jk/diff-filespec-cleanup' X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=e049109ef11be4e164c6f0426fb77c9c7a1ab647;p=git.git Merge branch 'jk/diff-filespec-cleanup' * jk/diff-filespec-cleanup: diff_filespec: use only 2 bits for is_binary flag diff_filespec: reorder is_binary field diff_filespec: drop xfrm_flags field diff_filespec: drop funcname_pattern_ident field diff_filespec: reorder dirty_submodule macro definitions --- e049109ef11be4e164c6f0426fb77c9c7a1ab647