2022-02-15 21:39:17 +08:00
|
|
|
#ifndef GITUTILS_H
|
|
|
|
#define GITUTILS_H
|
|
|
|
|
2022-02-21 23:35:28 +08:00
|
|
|
#include <QDateTime>
|
|
|
|
#include <QString>
|
|
|
|
#include <memory>
|
|
|
|
|
|
|
|
|
2022-02-15 21:39:17 +08:00
|
|
|
enum class GitResetStrategy {
|
|
|
|
Soft,
|
|
|
|
Hard,
|
|
|
|
Merge,
|
|
|
|
Mixed,
|
|
|
|
Keep
|
|
|
|
};
|
|
|
|
|
2022-02-20 13:26:15 +08:00
|
|
|
enum class GitMergeStrategy {
|
|
|
|
Resolve,
|
|
|
|
Recursive,
|
|
|
|
Ours,
|
|
|
|
Subtree
|
|
|
|
};
|
|
|
|
|
|
|
|
enum class GitMergeStrategyOption {
|
|
|
|
Ours,
|
|
|
|
Theirs,
|
|
|
|
Patience,
|
|
|
|
Ignore_Space_Change,
|
|
|
|
Ignore_All_Space,
|
|
|
|
Ignore_Space_At_Eol,
|
|
|
|
Renormalize,
|
|
|
|
No_Renormalize,
|
|
|
|
Find_Names,
|
|
|
|
Rename_Threshold,
|
|
|
|
Subtree
|
|
|
|
};
|
|
|
|
|
2022-02-21 23:35:28 +08:00
|
|
|
struct GitCommitInfo {
|
|
|
|
QString commitHash;
|
|
|
|
QString author;
|
|
|
|
QDateTime authorDate;
|
|
|
|
QString title;
|
|
|
|
QString fullCommitMessage;
|
|
|
|
};
|
|
|
|
|
|
|
|
using PGitCommitInfo = std::shared_ptr<GitCommitInfo>;
|
|
|
|
|
2022-02-15 21:39:17 +08:00
|
|
|
#endif // GITUTILS_H
|