Fix rebase issue and warning

Change-Id: Ic3b062c8be71887e00b6cfef2a52c61260c2e0ef
Reviewed-on: http://codereview.qt-project.org/6073
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

src/plugins/git/gitclient.cpp

@@ -1255,7 +1255,7 @@ bool GitClient::synchronousApplyPatch(const QString &workingDirectory,
 // Factory function to create an asynchronous command
 GitCommand *GitClient::createCommand(const QString &workingDirectory,
                                      VCSBase::VCSBaseEditorWidget* editor,
-                                     bool outputToWindow,
+                                     bool useOutputToWindow,
                                      int editorLineNumber)
 {
     GitCommand *command = new GitCommand(gitBinaryPath(), workingDirectory, processEnvironment(), QVariant(editorLineNumber));