feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
ceedde87694068bd1d4f97deaaf0d7cca6fa0780
qt-creator/src/plugins/git
History
jkobus ceedde8769 Try to show some meaningful diff when in merging state. 
Instead of showing 3-way diff, show simple diff
of conflicted file compared to the head of current branch.

Task-number: QTCREATORBUG-10099
Change-Id: I9419236f0249fd2752f89ea80a2a644fb80af095
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-13 16:53:24 +02:00
..
gerrit
Git: Rename gitBinaryPath => gitExecutable
2014-07-18 11:19:54 +02:00
gitorious
Vcs: Use Utils::FileName where possible in the CheckoutWizards
2014-05-26 11:45:08 +02: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
Clean up single namespace forward-declarations
2014-02-12 09:30:37 +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
Clean up single namespace forward-declarations
2014-02-12 09:30:37 +01:00
branchcheckoutdialog.ui
Git: Fix dialog titles
2013-02-26 12:54:40 +01:00
branchdialog.cpp
Git: Do not suggest tag name for local branch
2014-08-04 09:49:39 +02:00
branchdialog.h
Git: Add reset button to branches dialog
2014-02-25 15:44:10 +01:00
branchdialog.ui
Fix tooltips, add lacking dots
2014-03-13 12:06:27 +01:00
branchmodel.cpp
Git: Fix sha1 resolving when a branch is added from detached HEAD
2014-06-24 11:25:10 +02:00
branchmodel.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
changeselectiondialog.cpp
Git: Rename gitBinaryPath => gitExecutable
2014-07-18 11:19:54 +02:00
changeselectiondialog.h
Git: Rename gitBinaryPath => gitExecutable
2014-07-18 11:19:54 +02:00
changeselectiondialog.ui
Git: Set a title for change selection dialog
2014-01-16 17:08:41 +01:00
clonewizard.cpp
Vcs: Use Utils::FileName where possible in the CheckoutWizards
2014-05-26 11:45:08 +02:00
clonewizard.h
Vcs: Use Utils::FileName where possible in the CheckoutWizards
2014-05-26 11:45:08 +02:00
clonewizardpage.cpp
Git: Rename gitBinaryPath => gitExecutable
2014-07-18 11:19:54 +02:00
clonewizardpage.h
Git: Add auto tests for CloneWizardPage
2014-07-13 20:15:31 +02:00
commitdata.cpp
Reinvent deprecated qSort as Utils::sort
2014-06-19 14:00:32 +02:00
commitdata.h
Git: Simplify commit message codec handling
2014-03-18 13:44:58 +01:00
git_dependencies.pri
Qbs/qmake: Fix dependencies of plugins
2014-02-11 13:23:26 +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
use new base import style in qbs files
2014-03-11 14:20:22 +01:00
git.qrc
Git: Improve Push to Gerrit icon
2013-12-06 12:12:56 +01:00
gitclient.cpp
Try to show some meaningful diff when in merging state.
2014-08-13 16:53:24 +02:00
gitclient.h
Fix const correctness
2014-08-13 16:45:52 +02:00
gitconstants.h
Git: Remove diff editor
2014-06-24 11:20:59 +02:00
giteditor.cpp
Git: Factor source directory resolving to a function
2014-07-03 10:46:39 +02:00
giteditor.h
Git: Factor source directory resolving to a function
2014-07-03 10:46:39 +02:00
githighlighters.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
githighlighters.h
Clean up single namespace forward-declarations
2014-02-12 09:30:37 +01:00
gitplugin.cpp
Git: Fix suggested directory for clone
2014-07-16 12:00:15 +02:00
gitplugin.h
Git: Add auto tests for CloneWizardPage
2014-07-13 20:15:31 +02:00
gitsettings.cpp
Git: Rename gitBinaryPath => gitExecutable
2014-07-18 11:19:54 +02:00
gitsettings.h
Git: Rename gitBinaryPath => gitExecutable
2014-07-18 11:19:54 +02:00
gitsubmiteditor.cpp
Git: Fix crash when returning to commit editor from diff
2014-08-04 15:27:00 +02:00
gitsubmiteditor.h
Git: Use a separate thread for updating commit data
2014-06-24 12:00:22 +02:00
gitsubmiteditorwidget.cpp
LogChangeWidget: Fix keyboard navigation on all platforms
2014-04-16 14:57:05 +02:00
gitsubmiteditorwidget.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
gitsubmitpanel.ui
Centralize error/warning/info icons
2014-06-17 22:45:09 +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
Git: Rename gitBinaryPath => gitExecutable
2014-07-18 11:19:54 +02:00
gitversioncontrol.h
Git: Report additional search paths
2014-03-05 14:00:43 +01:00
logchangedialog.cpp
Git: Fix handling of Enter key on LogChangeDialog
2014-05-26 15:23:47 +02:00
logchangedialog.h
LogChangeWidget: Fix keyboard navigation on all platforms
2014-04-16 14:57:05 +02:00
mergetool.cpp
Git: Rename gitBinaryPath => gitExecutable
2014-07-18 11:19:54 +02: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
Git: Remotedialog, replace QTableView with QTreeView
2014-06-20 15:41:07 +02:00
remotedialog.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
remotedialog.ui
Git: Remotedialog, replace QTableView with QTreeView
2014-06-20 15:41:07 +02:00
remotemodel.cpp
Git: replace "Url" with "URL" in UI text
2014-07-17 18:00:38 +02:00
remotemodel.h
Git: Remotedialog, replace QTableView with QTreeView
2014-06-20 15:41:07 +02:00
settingspage.cpp
Git: Rename gitBinaryPath => gitExecutable
2014-07-18 11:19:54 +02:00
settingspage.h
Cleanup: Remove searchKeywords from optionspage widgets
2014-05-26 15:24:24 +02:00
settingspage.ui
DVCS: Never prompt before committing
2013-10-11 16:40:56 +02:00
stashdialog.cpp
Reinvent deprecated qSort as Utils::sort
2014-06-19 14:00:32 +02:00
stashdialog.h
Clean up single namespace forward-declarations
2014-02-12 09:30:37 +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