OSDN Git Service
(root)
/
tortoisegit
/
TortoiseGitJp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8e87099
)
Rebase: Skip in context-menu appeared twice. First one should be pick.
author
Johan 't Hart
<johanthart@gmail.com>
Mon, 8 Jun 2009 21:56:11 +0000
(23:56 +0200)
committer
Johan 't Hart
<johanthart@gmail.com>
Mon, 8 Jun 2009 21:56:11 +0000
(23:56 +0200)
src/TortoiseProc/GitLogListBase.cpp
patch
|
blob
|
history
diff --git
a/src/TortoiseProc/GitLogListBase.cpp
b/src/TortoiseProc/GitLogListBase.cpp
index
9dae894
..
51ba5d7
100644
(file)
--- a/
src/TortoiseProc/GitLogListBase.cpp
+++ b/
src/TortoiseProc/GitLogListBase.cpp
@@
-1181,7
+1181,7
@@
void CGitLogListBase::OnContextMenu(CWnd* pWnd, CPoint point)
{
\r
\r
if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_PICK))
\r
- popup.AppendMenuIcon(ID_REBASE_PICK, IDS_REBASE_
SKIP
, IDI_PICK);
\r
+ popup.AppendMenuIcon(ID_REBASE_PICK, IDS_REBASE_
PICK
, IDI_PICK);
\r
\r
if(m_ContextMenuMask&GetContextMenuBit(ID_REBASE_SQUASH))
\r
popup.AppendMenuIcon(ID_REBASE_SQUASH,IDS_REBASE_SQUASH, IDI_SQUASH);
\r