Skip to content

Commit 27b2827

Browse files
authored
Merge pull request #95 from GitGud-org/undoCommit
Undo commit
2 parents bb296a0 + 6d5a4eb commit 27b2827

File tree

3 files changed

+7
-78
lines changed

3 files changed

+7
-78
lines changed

components/MergeRevert.js renamed to components/CommitRevert.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const { Box, Text, NewLine } = require('ink')
44
const { execSync, exec } =require("child_process")
55
const TextInput = require("ink-text-input").default;
66

7-
const MergeRevert = (props) => {
7+
const CommitRevert = (props) => {
88
const [commitId, setCommitId] = useState("");
99

1010
let { refreshTab } = props;
@@ -43,4 +43,4 @@ const MergeRevert = (props) => {
4343
)
4444
}
4545

46-
module.exports = MergeRevert
46+
module.exports = CommitRevert

components/DropDownOther.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const { execSync, exec } = require("child_process");
66
const importJsx = require("import-jsx");
77
const TreeTab = importJsx('./TreeTab')
88
const Stash = importJsx('./Stash')
9-
const MergeRevert = importJsx('./MergeRevert')
9+
const CommitRevert = importJsx('./CommitRevert')
1010

1111
const popStash = require('../actions/undoStash')
1212

@@ -35,8 +35,8 @@ const dropDown = ({ refreshTab, accentColor, defaultColor }) => {
3535
value: 'undoStash'
3636
},
3737
{
38-
label: 'Undo Merge',
39-
value: 'undoMerge'
38+
label: 'Undo Commit',
39+
value: 'undoCommit'
4040
}
4141
]
4242
switch (currentDrop) {
@@ -61,11 +61,11 @@ const dropDown = ({ refreshTab, accentColor, defaultColor }) => {
6161
<popStash refreshTab={refreshTab} />
6262
</Box>
6363
)
64-
case 'undoMerge':
64+
case 'undoCommit':
6565
return (
6666
<Box flexDirection='column' marginLeft='109'>
6767
<SelectInput items={items} isFocused={false} displayDirection='column' defaultColor={defaultColor} accentColor={accentColor}/>
68-
<MergeRevert refreshTab={refreshTab} />
68+
<CommitRevert refreshTab={refreshTab} />
6969
</Box>
7070
)
7171
default:

components/DropDownOther.js~Updated upstream

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)