X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=log-tree.c;h=d3ae969f608b50a469aa60b2e925558a6bb437e5;hb=678e484b7d4e6388edeec3470bbbcd206817c148;hp=27afcf697238a48c01dd49996f5263cd72a52eac;hpb=1f54d693fda851a1df81e2b6c85f1c72f4633916;p=git.git

diff --git a/log-tree.c b/log-tree.c
index 27afcf697..d3ae969f6 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -514,6 +514,16 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
 			return 0;
 		else if (opt->combine_merges)
 			return do_diff_combined(opt, commit);
+		else if (opt->first_parent_only) {
+			/*
+			 * Generate merge log entry only for the first
+			 * parent, showing summary diff of the others
+			 * we merged _in_.
+			 */
+			diff_tree_sha1(parents->item->object.sha1, sha1, "", &opt->diffopt);
+			log_tree_diff_flush(opt);
+			return !opt->loginfo;
+		}
 
 		/* If we show individual diffs, show the parent info */
 		log->parent = parents->item;