feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
df9299fd2456f91405fe2a09a255a07949c775aa
qt-creator/src/plugins/git
History
Orgad Shaneh df9299fd24 Git: Do not hang on Continue Cherry-Pick/Revert 
...after conflicts resolving

Change-Id: I02637e19d1f5b595b2c63d8e001c0df6af94a347
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-01-14 11:11:29 +01:00
..
gerrit
Core: Merge Find and Locator into Core plugin
2014-01-14 07:43:00 +01:00
gitorious
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
images
Git: Improve Push to Gerrit icon
2013-12-06 12:12:56 +01:00
annotationhighlighter.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
annotationhighlighter.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
branchadddialog.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
branchadddialog.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
branchadddialog.ui
Git: added rename branch
2013-04-08 11:25:46 +02:00
branchcheckoutdialog.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
branchcheckoutdialog.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
branchcheckoutdialog.ui
Git: Fix dialog titles
2013-02-26 12:54:40 +01:00
branchdialog.cpp
Merge remote-tracking branch 'origin/3.0'
2014-01-08 11:01:06 +01:00
branchdialog.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
branchdialog.ui
Git: fix UI text capitalization and punctuation
2013-10-10 09:33:29 +02:00
branchmodel.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
branchmodel.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
changeselectiondialog.cpp
Merge remote-tracking branch 'origin/3.0'
2014-01-08 11:01:06 +01:00
changeselectiondialog.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
changeselectiondialog.ui
Revert "Git: add completion to ChangeSelectionDialog"
2013-12-22 08:47:06 +01:00
clonewizard.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
clonewizard.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
clonewizardpage.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
clonewizardpage.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
commitdata.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
commitdata.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
git_dependencies.pri
Core: Merge Find and Locator into Core plugin
2014-01-14 07:43:00 +01:00
Git.mimetypes.xml
Git: Provide a real highlighter for interactive rebase
2013-06-03 10:40:32 +02:00
Git.pluginspec.in
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
git.pro
Git: Revive ChangeSelectionDialog UI file
2013-10-01 23:14:35 +02:00
git.qbs
Core: Merge Find and Locator into Core plugin
2014-01-14 07:43:00 +01:00
git.qrc
Git: Improve Push to Gerrit icon
2013-12-06 12:12:56 +01:00
gitclient.cpp
Git: Do not hang on Continue Cherry-Pick/Revert
2014-01-14 11:11:29 +01:00
gitclient.h
Git: Do not hang on Continue Cherry-Pick/Revert
2014-01-14 11:11:29 +01:00
gitconstants.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
giteditor.cpp
Merge remote-tracking branch 'origin/3.0'
2014-01-08 11:01:06 +01:00
giteditor.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
githighlighters.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
githighlighters.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
gitplugin.cpp
Git: Do not hang on Continue Cherry-Pick/Revert
2014-01-14 11:11:29 +01:00
gitplugin.h
Core: Merge Find and Locator into Core plugin
2014-01-14 07:43:00 +01:00
gitsettings.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
gitsettings.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
gitsubmiteditor.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
gitsubmiteditor.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
gitsubmiteditorwidget.cpp
Merge remote-tracking branch 'origin/3.0'
2014-01-08 11:01:06 +01:00
gitsubmiteditorwidget.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
gitsubmitpanel.ui
Git: Reorder fields in submit panel
2012-06-25 10:28:01 +02:00
gitutils.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
gitutils.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
gitversioncontrol.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
gitversioncontrol.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
logchangedialog.cpp
Merge remote-tracking branch 'origin/3.0'
2014-01-08 11:01:06 +01:00
logchangedialog.h
Merge remote-tracking branch 'origin/3.0'
2014-01-08 11:01:06 +01:00
mergetool.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
mergetool.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
remoteadditiondialog.ui
Git: String updates
2011-05-13 14:56:31 +02:00
remotedialog.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
remotedialog.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
remotedialog.ui
Git: Push to non-default remotes
2011-12-08 11:18:10 +01:00
remotemodel.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
remotemodel.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
settingspage.cpp
Merge remote-tracking branch 'origin/3.0'
2014-01-08 11:01:06 +01:00
settingspage.h
Merge remote-tracking branch 'origin/3.0'
2014-01-08 11:01:06 +01:00
settingspage.ui
DVCS: Never prompt before committing
2013-10-11 16:40:56 +02:00
stashdialog.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
stashdialog.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
stashdialog.ui
VCS[git]: Add support for stashes.
2010-01-15 12:28:22 +01:00
TODO.txt
Git: Update TODO file
2013-02-27 15:27:27 +01:00