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

Changing diff editor's parameters shouldn't switch diff type

Browse Source 
Task-number: QTCREATORBUG-10221

Change-Id: I215460b11fa02605151523c8d4439b369fe7c3aa
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
jkobus
2013-09-25 10:34:49 +02:00
committed by Jarek Kobus
parent d15c6bba28
commit f8799a5583
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -594,7 +594,8 @@ public:
void executeCommand()
{
m_client->diff(m_workingDirectory, m_unstagedFileNames, m_stagedFileNames);
m_client->diff(m_workingDirectory, m_unstagedFileNames, m_stagedFileNames,
GitClient::SimpleTextDiffEditor);
}
private:
@@ -614,7 +615,7 @@ public:
void executeCommand()
{
m_client->diff(m_workingDirectory, m_fileName);
m_client->diff(m_workingDirectory, m_fileName, GitClient::SimpleTextDiffEditor);
}
private:
@@ -633,7 +634,8 @@ public:
void executeCommand()
{
m_client->diffBranch(m_workingDirectory, baseArguments(), m_branchName);
m_client->diffBranch(m_workingDirectory, baseArguments(), m_branchName,
GitClient::SimpleTextDiffEditor);
}
private:
@@ -668,7 +670,8 @@ public:
void executeCommand()
{
m_client->show(m_workingDirectory, m_id, baseArguments());
m_client->show(m_workingDirectory, m_id, baseArguments(), QString(),
GitClient::SimpleTextDiffEditor);
}
private: