Fix some regressions in git handling
Set default to rebase for pull
Update error string on auth failure
Improve trace logging
(cherry picked from commit b8225ba2d6)
This commit is contained in:
@@ -85,6 +85,7 @@ private:
|
||||
std::string getFormattedCommitDate( const git_time& aTime );
|
||||
PullResult handleFastForward();
|
||||
PullResult handleMerge( const git_annotated_commit** aMergeHeads, size_t aMergeHeadsCount );
|
||||
PullResult handleRebase( const git_annotated_commit** aMergeHeads, size_t aMergeHeadsCount );
|
||||
};
|
||||
|
||||
#endif // _GIT_PULL_HANDLER_H_
|
||||
|
||||
Reference in New Issue
Block a user