feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
a2171c2d82b810e7f596f371a7d1d3cc6989a9dd
qt-creator/src/plugins/git
History
Eike Ziller a2171c2d82 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
2013-05-03 09:49:28 +02:00
..
gerrit
Gerrit: Add accelerators for Push to Gerrit dialog
2013-04-30 14:37:49 +02:00
gitorious
Provide instance()-method for Utils::NetworkAccessManager.
2013-04-09 11:39:56 +02:00
images
Add icons for checkout and clone wizards.
2010-05-19 18:40:45 +02:00
annotationhighlighter.cpp
Incremented year in copyright info
2013-01-29 16:27:03 +01:00
annotationhighlighter.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
branchadddialog.cpp
Git: added rename branch
2013-04-08 11:25:46 +02:00
branchadddialog.h
Git: added rename branch
2013-04-08 11:25:46 +02:00
branchadddialog.ui
Git: added rename branch
2013-04-08 11:25:46 +02:00
branchcheckoutdialog.cpp
Git: Auto stash for branches
2013-01-07 15:33:20 +01:00
branchcheckoutdialog.h
Git: Auto stash for branches
2013-01-07 15:33:20 +01:00
branchcheckoutdialog.ui
Git: Fix dialog titles
2013-02-26 12:54:40 +01:00
branchdialog.cpp
Git: Support graph log for all log types (file, project, repo)
2013-04-29 11:01:05 +02:00
branchdialog.h
Git: added rename branch
2013-04-08 11:25:46 +02:00
branchdialog.ui
Git: added rename branch
2013-04-08 11:25:46 +02:00
branchmodel.cpp
Git: make ensureStash dialog more clear.
2013-04-19 07:48:27 +02:00
branchmodel.h
Git: Also show tags in the branches dialog
2013-04-11 17:06:24 +02:00
changeselectiondialog.cpp
Git - ChangeSelectionDialog select from recent history
2013-04-30 13:37:05 +02:00
changeselectiondialog.h
Git - ChangeSelectionDialog select from recent history
2013-04-30 13:37:05 +02:00
clonewizard.cpp
Incremented year in copyright info
2013-01-29 16:27:03 +01:00
clonewizard.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
clonewizardpage.cpp
Clean headers in Git.
2013-04-05 15:10:02 +02:00
clonewizardpage.h
Git: Simplify cloning of a specific branch
2013-02-18 20:18:39 +01:00
commitdata.cpp
Git: Add commit type to CommitData
2013-05-02 16:52:10 +02:00
commitdata.h
Git: Add commit type to CommitData
2013-05-02 16:52:10 +02:00
git_dependencies.pri
make library and plugin dependencies declarative
2013-04-03 14:37:45 +02:00
Git.pluginspec.in
auto-generate <dependencyList> in .pluginspec files
2013-04-11 12:52:03 +02:00
git.pro
Git: refactoring ChangeSelectionDialog
2013-04-04 19:15:59 +02:00
git.qbs
Gerrit: Added pushToGerrit dialog
2013-04-05 11:28:05 +02:00
git.qrc
Add icons for checkout and clone wizards.
2010-05-19 18:40:45 +02:00
gitclient.cpp
Merge remote-tracking branch 'origin/2.7'
2013-05-03 09:49:28 +02:00
gitclient.h
Git: Pass CommitData by reference
2013-05-02 16:52:55 +02:00
gitconstants.h
Incremented year in copyright info
2013-01-29 16:27:03 +01:00
giteditor.cpp
Merge remote-tracking branch 'origin/2.7'
2013-04-30 11:43:33 +02:00
giteditor.h
Git: Recognize SHA1s from 7 to 40 digits.
2013-03-19 16:35:33 +01:00
gitplugin.cpp
Git: Pass CommitData by reference
2013-05-02 16:52:55 +02:00
gitplugin.h
Git: Add commit type to CommitData
2013-05-02 16:52:10 +02:00
gitsettings.cpp
Git: Support graph log for all log types (file, project, repo)
2013-04-29 11:01:05 +02:00
gitsettings.h
Git: Use an enum for simple/amend commit
2013-04-30 14:38:00 +02:00
gitsubmiteditor.cpp
Git: Pass CommitData by reference
2013-05-02 16:52:55 +02:00
gitsubmiteditor.h
Git: Add commit type to CommitData
2013-05-02 16:52:10 +02:00
gitsubmiteditorwidget.cpp
Git: Fix commit message highlighting
2013-04-29 14:45:29 +02:00
gitsubmiteditorwidget.h
Git: Fix closing namespace comment.
2013-04-29 11:12:01 +02:00
gitsubmitpanel.ui
Git: Reorder fields in submit panel
2012-06-25 10:28:01 +02:00
gitutils.cpp
Clean headers in Git.
2013-04-05 15:10:02 +02:00
gitutils.h
Git: Require 1.7.2
2013-02-20 13:29:11 +01:00
gitversioncontrol.cpp
Clean headers in Git.
2013-04-05 15:10:02 +02:00
gitversioncontrol.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
logchangedialog.cpp
Git: Factor out the central widget from LogChangeDialog
2013-04-30 14:38:05 +02:00
logchangedialog.h
Git: Factor out the central widget from LogChangeDialog
2013-04-30 14:38:05 +02:00
mergetool.cpp
Merge remote-tracking branch 'origin/2.7'
2013-04-08 13:26:37 +02:00
mergetool.h
Git: Move some functions from MergeTool to GitClient
2013-03-01 15:25:35 +01:00
remoteadditiondialog.ui
Git: String updates
2011-05-13 14:56:31 +02:00
remotedialog.cpp
Clean headers in Git.
2013-04-05 15:10:02 +02:00
remotedialog.h
Merge remote-tracking branch 'origin/2.6'
2013-01-31 16:25:33 +01:00
remotedialog.ui
Git: Push to non-default remotes
2011-12-08 11:18:10 +01:00
remotemodel.cpp
Gerrit: added ability to save path for applying patches
2013-04-05 11:27:57 +02:00
remotemodel.h
Gerrit: added ability to save path for applying patches
2013-04-05 11:27:57 +02:00
settingspage.cpp
Git: Also show tags in the branches dialog
2013-04-11 17:06:24 +02:00
settingspage.h
Clean headers in Git.
2013-04-05 15:10:02 +02:00
settingspage.ui
Git: Also show tags in the branches dialog
2013-04-11 17:06:24 +02:00
stashdialog.cpp
Clean headers in Git.
2013-04-05 15:10:02 +02:00
stashdialog.h
Incremented year in copyright info
2013-01-29 16:27:03 +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