From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Jun 2010 19:07:44 +0000 (-0700)
Subject: Merge branch 'ab/blame-textconv'
X-Git-Tag: v1.7.2-rc0~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4af574dbdc543b43e16838ed69890470b763136d;p=git.git

Merge branch 'ab/blame-textconv'

* ab/blame-textconv:
  t/t8006: test textconv support for blame
  textconv: support for blame
  textconv: make the API public

Conflicts:
	diff.h
---

4af574dbdc543b43e16838ed69890470b763136d
diff --cc diff.h
index 48abe7a96,2a0e36d7a..063d10ac2
--- a/diff.h
+++ b/diff.h
@@@ -9,7 -9,8 +9,9 @@@
  struct rev_info;
  struct diff_options;
  struct diff_queue_struct;
 +struct strbuf;
+ struct diff_filespec;
+ struct userdiff_driver;
  
  typedef void (*change_fn_t)(struct diff_options *options,
  		 unsigned old_mode, unsigned new_mode,
@@@ -74,6 -73,6 +76,7 @@@ typedef struct strbuf *(*diff_prefix_fn
  #define DIFF_OPT_SUBMODULE_LOG       (1 << 23)
  #define DIFF_OPT_DIRTY_SUBMODULES    (1 << 24)
  #define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
++#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
  
  #define DIFF_OPT_TST(opts, flag)    ((opts)->flags & DIFF_OPT_##flag)
  #define DIFF_OPT_SET(opts, flag)    ((opts)->flags |= DIFF_OPT_##flag)