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/gitsettings.cpp

@@ -106,6 +106,7 @@ GitSettings &GitSettings::operator = (const GitSettings &s)
 {
     VCSBaseClientSettings::operator =(s);
     m_binaryPath.clear();
+    return *this;
 }
 
 } // namespace Internal