summary refs log tree commit diff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-03-07 09:59:54 +0900
committerJunio C Hamano <gitster@pobox.com>2019-03-07 09:59:54 +0900
commitc425d361f5bf46d99cd96d7eac3488ebb2e92b60 (patch)
tree9cfdd1b91fc759cb1e561c6302bbd9cfe37245ba /diff.h
parentcf0879f7e98d2213503622f780d2ab0dd3f93477 (diff)
parentd76ce4f734634f47b467b7f6eea11d6bf8c81f22 (diff)
Merge branch 'en/combined-all-paths'
Output from "diff --cc" did not show the original paths when the
merge involved renames.  A new option adds the paths in the
original trees to the output.

* en/combined-all-paths:
  log,diff-tree: add --combined-all-paths option
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index d9ad73f0e1..3199ba31f8 100644
--- a/diff.h
+++ b/diff.h
@@ -296,6 +296,7 @@ struct combine_diff_path {
 		char status;
 		unsigned int mode;
 		struct object_id oid;
+		struct strbuf path;
 	} parent[FLEX_ARRAY];
 };
 #define combine_diff_path_size(n, l) \