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

VCS[git]: Introduce optional pull --rebase.

Browse Source 
Do 'git rebase --abort' if something fails.
This commit is contained in:
Friedemann Kleint
2010-03-19 16:07:34 +01:00
parent 59d827c697
commit bcd020f382
10 changed files with 89 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,7 +179,7 @@ void GitEditor::setPlainTextDataFiltered(const QByteArray &a)
}
}
void GitEditor::commandFinishedGotoLine(bool ok, const QVariant &v)
void GitEditor::commandFinishedGotoLine(bool ok, int /* exitCode */, const QVariant &v)
{
if (ok && v.type() == QVariant::Int) {
const int line = v.toInt();