src/plugins/git · 5f2fe51c52e11c67ab66cfad43c02c7e004cfb8c · Marco Bubke / flatpak-qt-creator

Git: Enable choosing non-fast-forward merge

Orgad Shaneh authored 11 years ago

Change-Id: I5972489d06637616953bd0d93a3b65c4d9918377
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>

4a5af14b

History

4a5af14b 11 years ago

History

Name	Last commit	Last update
..
gerrit
gitorious
images
Git.mimetypes.xml
Git.pluginspec.in
TODO.txt
annotationhighlighter.cpp
annotationhighlighter.h
branchadddialog.cpp
branchadddialog.h
branchadddialog.ui
branchcheckoutdialog.cpp
branchcheckoutdialog.h
branchcheckoutdialog.ui
branchdialog.cpp
branchdialog.h
branchdialog.ui
branchmodel.cpp
branchmodel.h
changeselectiondialog.cpp
changeselectiondialog.h
changeselectiondialog.ui
clonewizard.cpp
clonewizard.h
clonewizardpage.cpp
clonewizardpage.h
commitdata.cpp
commitdata.h
git.pro
git.qbs
git.qrc
git_dependencies.pri
gitclient.cpp
gitclient.h
gitconstants.h
giteditor.cpp
giteditor.h
githighlighters.cpp
githighlighters.h
gitplugin.cpp
gitplugin.h
gitsettings.cpp
gitsettings.h
gitsubmiteditor.cpp
gitsubmiteditor.h
gitsubmiteditorwidget.cpp
gitsubmiteditorwidget.h
gitsubmitpanel.ui
gitutils.cpp
gitutils.h
gitversioncontrol.cpp
gitversioncontrol.h
logchangedialog.cpp
logchangedialog.h
mergetool.cpp
mergetool.h
remoteadditiondialog.ui
remotedialog.cpp
remotedialog.h
remotedialog.ui
remotemodel.cpp
remotemodel.h
settingspage.cpp
settingspage.h
settingspage.ui
stashdialog.cpp
stashdialog.h
stashdialog.ui