From 3afd39927213a82bf8f59a54cb99cd209da5e4d0 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 20 Feb 2015 13:27:28 +0300
Subject: [PATCH] [git] IDEA-78347 Use --full-history --simplify-merges for
 file history

This will solve the issue of hiding commit+its revert from Git,
but will avoid showing unrelated merges.
---
 plugins/git4idea/src/git4idea/history/GitHistoryUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
index c9824aeec26f..f347d3aab5e0 100644
--- a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
+++ b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
@@ -355,7 +355,7 @@ public class GitHistoryUtils {
   private static GitLineHandler getLogHandler(Project project, VirtualFile root, GitLogParser parser, FilePath path, String lastCommit, String... parameters) {
     final GitLineHandler h = new GitLineHandler(project, root, GitCommand.LOG);
     h.setStdoutSuppressed(true);
-    h.addParameters("--name-status", parser.getPretty(), "--encoding=UTF-8", lastCommit);
+    h.addParameters("--name-status", parser.getPretty(), "--encoding=UTF-8", "--full-history", "--simplify-merges", lastCommit);
     if (parameters != null && parameters.length > 0) {
       h.addParameters(parameters);
     }