feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Detect renames and copies on diff

Browse Source 
Change-Id: I96e822df7eb5a0fc85108163a7ecf7b5e2a98d58
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-04-20 15:42:16 +03:00
committed by Orgad Shaneh
parent 2f3d2a2490
commit 9e1e11db60
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/git/gitclient.cpp
View File

@@ -181,6 +181,7 @@ QStringList BaseController::addConfigurationArguments(const QStringList &args) c
QStringList realArgs; QStringList realArgs;
realArgs << args.at(0); realArgs << args.at(0);
realArgs << QLatin1String("-m"); // show diff agains parents instead of merge commits realArgs << QLatin1String("-m"); // show diff agains parents instead of merge commits
realArgs << QLatin1String("-M") << QLatin1String("-C"); // Detect renames and copies
realArgs << QLatin1String("--first-parent"); // show only first parent realArgs << QLatin1String("--first-parent"); // show only first parent
if (ignoreWhitespace()) if (ignoreWhitespace())
realArgs << QLatin1String("--ignore-space-change"); realArgs << QLatin1String("--ignore-space-change");