GIT_COMMIT_PANE::MERGE_PREPARATION Struct Reference

Public Attributes
std::unique_ptr< GIT_DIFF_WORKSPACE >	workspace
wxString	headOid
wxString	theirsOid
wxString	rootDir
wxString	error
std::vector< KIGIT_CONFLICT_SIDES >	conflicts
KIGIT::GIT_IDENTITY	identity
bool	rebaseConfigured = false
bool	prepared = false

Detailed Description

Definition at line 2153 of file git_commit_pane.cpp.

Member Data Documentation

conflicts

std::vector<KIGIT_CONFLICT_SIDES> GIT_COMMIT_PANE::MERGE_PREPARATION::conflicts

Definition at line 2160 of file git_commit_pane.cpp.

error

wxString GIT_COMMIT_PANE::MERGE_PREPARATION::error

Definition at line 2159 of file git_commit_pane.cpp.

headOid

wxString GIT_COMMIT_PANE::MERGE_PREPARATION::headOid

Definition at line 2156 of file git_commit_pane.cpp.

identity

KIGIT::GIT_IDENTITY GIT_COMMIT_PANE::MERGE_PREPARATION::identity

Definition at line 2161 of file git_commit_pane.cpp.

prepared

bool GIT_COMMIT_PANE::MERGE_PREPARATION::prepared = false

Definition at line 2163 of file git_commit_pane.cpp.

rebaseConfigured

bool GIT_COMMIT_PANE::MERGE_PREPARATION::rebaseConfigured = false

Definition at line 2162 of file git_commit_pane.cpp.

rootDir

wxString GIT_COMMIT_PANE::MERGE_PREPARATION::rootDir

Definition at line 2158 of file git_commit_pane.cpp.

theirsOid

wxString GIT_COMMIT_PANE::MERGE_PREPARATION::theirsOid

Definition at line 2157 of file git_commit_pane.cpp.

workspace

std::unique_ptr<GIT_DIFF_WORKSPACE> GIT_COMMIT_PANE::MERGE_PREPARATION::workspace

Definition at line 2155 of file git_commit_pane.cpp.

---

The documentation for this struct was generated from the following file:

• git_commit_pane.cpp