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

VCS/git: Add setting for diff --patience and make it default.

Browse Source
This commit is contained in:
Friedemann Kleint
2010-03-10 11:19:59 +01:00
parent d0da52f548
commit edf3437644
5 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,6 +233,8 @@ void GitClient::diff(const QString &workingDirectory,
// Directory diff?
QStringList commonDiffArgs;
commonDiffArgs << QLatin1String("diff") << QLatin1String(noColorOption);
if (m_settings.diffPatience)
commonDiffArgs << QLatin1String("--patience");
if (unstagedFileNames.empty() && stagedFileNames.empty()) {
QStringList arguments(commonDiffArgs);
arguments << diffArgs;