Tobias Hunger b6608d0d37 Git: Simplify use of conflict handler a bit ...

Disentangle binding to an existing command from the actual task of
the conflict handler. This makes usage more clear.

Also rename "command" to "abortCommand" which is also more clear
as to what it is used for.

Change-Id: I862cfec97fbf512a3121f0a7d58ae12f148879a6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

2015-04-15 10:12:14 +00:00

..

gerrit

Git: Add override

2015-04-12 20:03:04 +00:00

images

Git: Remove gitorious code

2014-09-25 15:19:51 +02:00

annotationhighlighter.cpp

Update License

2015-01-16 12:37:56 +01:00

annotationhighlighter.h

Git: Add override

2015-04-12 20:03:04 +00:00

branchadddialog.cpp

Git: Add override

2015-04-12 20:03:04 +00:00

branchadddialog.h

Update License

2015-01-16 12:37:56 +01:00

branchadddialog.ui

Git: added rename branch

2013-04-08 11:25:46 +02:00

branchcheckoutdialog.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

branchcheckoutdialog.h

Update License

2015-01-16 12:37:56 +01:00

branchcheckoutdialog.ui

Git: Fix dialog titles

2013-02-26 12:54:40 +01:00

branchdialog.cpp

Git: s/GitPlugin::gitClient/GitPlugin::client/

2015-04-08 09:52:25 +00:00

branchdialog.h

Update License

2015-01-16 12:37:56 +01:00

branchdialog.ui

Fix tooltips, add lacking dots

2014-03-13 12:06:27 +01:00

branchmodel.cpp

Vcs: Move handling of settings from VcsBaseClient to VcsBaseClientImpl

2015-04-08 09:30:44 +00:00

branchmodel.h

Git: Add override

2015-04-12 20:03:04 +00:00

changeselectiondialog.cpp

Git: s/GitPlugin::gitClient/GitPlugin::client/

2015-04-08 09:52:25 +00:00

changeselectiondialog.h

Update License

2015-01-16 12:37:56 +01:00

changeselectiondialog.ui

Git: Set a title for change selection dialog

2014-01-16 17:08:41 +01:00

clonewizard.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

clonewizard.h

Git: Add override

2015-04-12 20:03:04 +00:00

clonewizardpage.cpp

Git: s/GitPlugin::gitClient/GitPlugin::client/

2015-04-08 09:52:25 +00:00

clonewizardpage.h

Git: Add override

2015-04-12 20:03:04 +00:00

commitdata.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

commitdata.h

Update License

2015-01-16 12:37:56 +01:00

git_dependencies.pri

Qbs/qmake: Fix dependencies of plugins

2014-02-11 13:23:26 +01:00

Git.json.in

Update License

2015-01-16 12:37:56 +01:00

Git.mimetypes.xml

Git: Provide a real highlighter for interactive rebase

2013-06-03 10:40:32 +02:00

git.pro

Git: Remove gitorious code

2014-09-25 15:19:51 +02:00

git.qbs

qbs build: Remove unneeded import statements.

2014-11-10 15:45:14 +01:00

git.qrc

Git: Remove gitorious code

2014-09-25 15:19:51 +02:00

gitclient.cpp

Git: Simplify use of conflict handler a bit

2015-04-15 10:12:14 +00:00

gitclient.h

Vcs: Move vcsSynchronousExec into VcsBaseClientImpl

2015-04-14 11:22:00 +00:00

gitconstants.h

Update License

2015-01-16 12:37:56 +01:00

giteditor.cpp

Git: Fix filtering of date/time in blame

2015-04-12 20:05:33 +00:00

giteditor.h

Git: Fix filtering of date/time in blame

2015-04-12 20:05:33 +00:00

githighlighters.cpp

Update License

2015-01-16 12:37:56 +01:00

githighlighters.h

Git: Add override

2015-04-12 20:03:04 +00:00

gitplugin.cpp

Vcs: Move annotate and annotateRevisionRequested into VcsBaseClientImpl

2015-04-13 10:40:58 +00:00

gitplugin.h

Git: Add override

2015-04-12 20:03:04 +00:00

gitsettings.cpp

Clean exported headers of the VcsBase plugin.

2015-02-26 10:57:52 +00:00

gitsettings.h

Update License

2015-01-16 12:37:56 +01:00

gitsubmiteditor.cpp

Git: Add override

2015-04-12 20:03:04 +00:00

gitsubmiteditor.h

Git: Add override

2015-04-12 20:03:04 +00:00

gitsubmiteditorwidget.cpp

Git: commit submit widget add tooltip to error label

2015-03-27 12:25:49 +00:00

gitsubmiteditorwidget.h

Git: Add override

2015-04-12 20:03:04 +00:00

gitsubmitpanel.ui

Fix placement of Bypass hooks checkbox

2014-08-11 12:45:16 +02:00

gitutils.cpp

Update License

2015-01-16 12:37:56 +01:00

gitutils.h

Update License

2015-01-16 12:37:56 +01:00

gitversioncontrol.cpp

Vcs: Move annotate and annotateRevisionRequested into VcsBaseClientImpl

2015-04-13 10:40:58 +00:00

gitversioncontrol.h

Git: Add override

2015-04-12 20:03:04 +00:00

logchangedialog.cpp

Git: s/GitPlugin::gitClient/GitPlugin::client/

2015-04-08 09:52:25 +00:00

logchangedialog.h

Git: Add override

2015-04-12 20:03:04 +00:00

mergetool.cpp

Git: Add override

2015-04-12 20:03:04 +00:00

mergetool.h

Git: s/GitPlugin::gitClient/GitPlugin::client/

2015-04-08 09:52:25 +00:00

remoteadditiondialog.ui

Git: String updates

2011-05-13 14:56:31 +02:00

remotedialog.cpp

Git: s/GitPlugin::gitClient/GitPlugin::client/

2015-04-08 09:52:25 +00:00

remotedialog.h

Update License

2015-01-16 12:37:56 +01:00

remotedialog.ui

Git: Remotedialog, replace QTableView with QTreeView

2014-06-20 15:41:07 +02:00

remotemodel.cpp

Update License

2015-01-16 12:37:56 +01:00

remotemodel.h

Git: Add override

2015-04-12 20:03:04 +00:00

settingspage.cpp

Vcs: Unify options pages for VcsBaseClientImpl based VCSes

2015-04-09 07:25:11 +00:00

settingspage.h

Vcs: Unify options pages for VcsBaseClientImpl based VCSes

2015-04-09 07:25:11 +00:00

settingspage.ui

Fix layouts for OSX: Set the obligatory ExpandingFieldsGrow

2015-02-24 11:45:53 +00:00

stashdialog.cpp

Git: s/GitPlugin::gitClient/GitPlugin::client/

2015-04-08 09:52:25 +00:00

stashdialog.h

Update License

2015-01-16 12:37:56 +01:00

stashdialog.ui

Git: Fix keyboard activation in StashView

2014-04-14 12:08:16 +02:00

TODO.txt

Git: Update TODO file

2013-02-27 15:27:27 +01:00