feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Basic integration of diff editor inside git plugin

Browse Source 
Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
jkobus
2013-05-07 14:02:08 +02:00
committed by Tobias Hunger
parent 60b1aaeae4
commit 97a86c50dc
20 changed files with 967 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/git/gitsettings.h
View File

@@ -48,6 +48,7 @@ class GitSettings : public VcsBase::VcsBaseClientSettings
public:
GitSettings();
static const QLatin1String useDiffEditorKey;
static const QLatin1String pullRebaseKey;
static const QLatin1String showTagsKey;
static const QLatin1String omitAnnotationDateKey;