CSplitterControl::ChangePos(GetDlgItem(IDC_SQUASH_ALL),0,delta);\r
CSplitterControl::ChangePos(GetDlgItem(IDC_PICK_ALL),0,delta);\r
CSplitterControl::ChangePos(GetDlgItem(IDC_EDIT_ALL),0,delta);\r
+ CSplitterControl::ChangePos(GetDlgItem(IDC_REBASE_CHECK_FORCE),0,delta);\r
\r
this->AddRebaseAnchor();\r
// adjust the minimum size of the dialog to prevent the resizing from\r
int CRebaseDlg::StartRebase()\r
{\r
CString cmd,out;\r
-\r
+ m_FileListCtrl.m_bIsRevertTheirMy = !m_IsCherryPick;\r
if(!this->m_IsCherryPick)\r
{\r
//Todo call comment_for_reflog\r
this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(TRUE);\r
this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(TRUE);\r
this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(TRUE);\r
+ \r
if(!m_IsCherryPick)\r
{\r
this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(TRUE);\r
this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(TRUE);\r
+ this->GetDlgItem(IDC_REBASE_CHECK_FORCE)->EnableWindow(TRUE); \r
}\r
//this->m_CommitList.m_IsEnableRebaseMenu=TRUE;\r
this->m_CommitList.m_ContextMenuMask |= m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK)|\r
this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(FALSE);\r
this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(FALSE);\r
this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(FALSE);\r
+ this->GetDlgItem(IDC_REBASE_CHECK_FORCE)->EnableWindow(FALSE);\r
//this->m_CommitList.m_IsEnableRebaseMenu=FALSE;\r
this->m_CommitList.m_ContextMenuMask &= ~(m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK)|\r
m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH)|\r
CTGitPath path;\r
list.AddPath(path);\r
\r
+ m_FileListCtrl.m_bIsRevertTheirMy = !m_IsCherryPick;\r
+\r
this->m_FileListCtrl.GetStatus(&list,true);\r
this->m_FileListCtrl.Show(CTGitPath::LOGACTIONS_UNMERGED|CTGitPath::LOGACTIONS_MODIFIED|CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_DELETED,\r
CTGitPath::LOGACTIONS_UNMERGED);\r