CString GetUserName(void);\r
CString GetUserEmail(void);\r
CString GetCurrentBranch(void);\r
+ // read current branch name from HEAD file, returns 0 on success, -1 on failure, 1 detached (branch name "HEAD" returned)\r
+ int GetCurrentBranchFromFile(const CString &sProjectRoot, CString &sBranchOut);\r
+ BOOL CheckCleanWorkTree();\r
+ int Revert(CTGitPath &path,bool keep=true);\r
+ int Revert(CTGitPathList &list,bool keep=true);\r
\r
bool SetCurrentDir(CString path)\r
{\r
static void StringAppend(CString *str,BYTE *p,int code=CP_UTF8,int length=-1);\r
\r
BOOL IsInitRepos();\r
- static BOOL IsVista();\r
+ int ListConflictFile(CTGitPathList &list,CTGitPath *path=NULL);\r
\r
};\r
extern void GetTempPath(CString &path);\r