Merge branch 'master' into jc/diff

* master:
  Make "--parents" logs also be incremental
  Retire diffcore-pathspec.
  Improve the git-diff-tree -c/-cc documentation

1 files changed, 0 insertions, 1 deletions

diff --git a/diff.h b/diff.h
index 0cebec113..a02ef2820 100644
--- a/diff.h
+++ b/diff.h
@@ -20,7 +20,6 @@ typedef void (*add_remove_fn_t)(struct diff_options *options,
 		    const char *base, const char *path);
 
 struct diff_options {
-	const char **paths;
 	const char *filter;
 	const char *orderfile;
 	const char *pickaxe;