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

Git: Enable different reset types for commits in git editors

Browse Source 
Change-Id: I0eafbd3db04a7da4ea85457ae67a940c71b49e9b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-03-10 12:03:03 +02:00
committed by Orgad Shaneh
parent 1eeca66c29
commit 690a545f8e
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/giteditor.h
View File

@@ -56,13 +56,13 @@ public slots:
private slots:
void checkoutChange();
void resetChange();
void cherryPickChange();
void revertChange();
void applyDiffChunk(const VcsBase::DiffChunk& chunk, bool revert);
private:
void init();
void resetChange(const QByteArray &resetType);
void addDiffActions(QMenu *menu, const VcsBase::DiffChunk &chunk);
bool open(QString *errorString, const QString &fileName, const QString &realFileName);
QSet<QString> annotationChanges() const;