| 1 | #ifndef GITUTILS_H |
| 2 | #define GITUTILS_H |
| 3 | |
| 4 | #include <QDateTime> |
| 5 | #include <QString> |
| 6 | #include <memory> |
| 7 | |
| 8 | |
| 9 | enum class GitResetStrategy { |
| 10 | Soft, |
| 11 | Hard, |
| 12 | Merge, |
| 13 | Mixed, |
| 14 | Keep |
| 15 | }; |
| 16 | |
| 17 | enum class GitMergeStrategy { |
| 18 | Resolve, |
| 19 | Recursive, |
| 20 | Ours, |
| 21 | Subtree |
| 22 | }; |
| 23 | |
| 24 | enum class GitMergeStrategyOption { |
| 25 | Ours, |
| 26 | Theirs, |
| 27 | Patience, |
| 28 | Ignore_Space_Change, |
| 29 | Ignore_All_Space, |
| 30 | Ignore_Space_At_Eol, |
| 31 | Renormalize, |
| 32 | No_Renormalize, |
| 33 | Find_Names, |
| 34 | Rename_Threshold, |
| 35 | Subtree |
| 36 | }; |
| 37 | |
| 38 | struct GitCommitInfo { |
| 39 | QString commitHash; |
| 40 | QString author; |
| 41 | QDateTime authorDate; |
| 42 | QString title; |
| 43 | QString fullCommitMessage; |
| 44 | }; |
| 45 | |
| 46 | using PGitCommitInfo = std::shared_ptr<GitCommitInfo>; |
| 47 | |
| 48 | #endif // GITUTILS_H |
| 49 | |