Skip to content

Commit cb3773d

Browse files
committed
Rename checkbox for interactive rebase
1 parent f3d2aba commit cb3773d

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,15 +224,15 @@
224224
},
225225
"merge": {
226226
"type": "boolean",
227-
"title": "Merge into current branch..."
227+
"title": "Merge into current Branch..."
228228
},
229229
"rebase": {
230230
"type": "boolean",
231-
"title": "Rebase current branch on this Commit..."
231+
"title": "Rebase current Branch on this Commit..."
232232
},
233233
"reset": {
234234
"type": "boolean",
235-
"title": "Reset current branch to this Commit..."
235+
"title": "Reset current Branch to this Commit..."
236236
},
237237
"copyHash": {
238238
"type": "boolean",
@@ -693,12 +693,12 @@
693693
"git-graph.dialog.rebase.ignoreDate": {
694694
"type": "boolean",
695695
"default": true,
696-
"description": "Default state of the \"Ignore Date (non-interactive rebase only)\" checkbox."
696+
"description": "Checkbox \"Ignore Date (non-interactive rebase only)\" active by default."
697697
},
698698
"git-graph.dialog.rebase.launchInteractiveRebase": {
699699
"type": "boolean",
700700
"default": false,
701-
"description": "Default state of the \"Launch Interactive Rebase in new Terminal\" checkbox."
701+
"description": "Checkbox \"Interactive Rebase (launch in new Terminal)\" active by default."
702702
},
703703
"git-graph.dialog.resetCurrentBranchToCommit.mode": {
704704
"type": "string",

web/main.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ class GitGraphView {
10681068
visible: visibility.merge && this.gitBranchHead !== refName,
10691069
onClick: () => this.mergeAction(refName, refName, GG.MergeActionOn.Branch, target)
10701070
}, {
1071-
title: 'Rebase current branch on Branch' + ELLIPSIS,
1071+
title: 'Rebase current Branch on Branch' + ELLIPSIS,
10721072
visible: visibility.rebase && this.gitBranchHead !== refName,
10731073
onClick: () => this.rebaseAction(refName, refName, GG.RebaseActionOn.Branch, target)
10741074
}, {
@@ -1263,7 +1263,7 @@ class GitGraphView {
12631263
visible: visibility.merge,
12641264
onClick: () => this.mergeAction(hash, abbrevCommit(hash), GG.MergeActionOn.Commit, target)
12651265
}, {
1266-
title: 'Rebase current branch on this Commit' + ELLIPSIS,
1266+
title: 'Rebase current Branch on this Commit' + ELLIPSIS,
12671267
visible: visibility.rebase,
12681268
onClick: () => this.rebaseAction(hash, abbrevCommit(hash), GG.RebaseActionOn.Commit, target)
12691269
}, {
@@ -1749,7 +1749,7 @@ class GitGraphView {
17491749

17501750
private rebaseAction(obj: string, name: string, actionOn: GG.RebaseActionOn, target: DialogTarget & (CommitTarget | RefTarget)) {
17511751
dialog.showForm('Are you sure you want to rebase ' + (this.gitBranchHead !== null ? '<b><i>' + escapeHtml(this.gitBranchHead) + '</i></b> (the current branch)' : 'the current branch') + ' on ' + actionOn.toLowerCase() + ' <b><i>' + escapeHtml(name) + '</i></b>?', [
1752-
{ type: DialogInputType.Checkbox, name: 'Launch Interactive Rebase in new Terminal', value: this.config.dialogDefaults.rebase.interactive },
1752+
{ type: DialogInputType.Checkbox, name: 'Interactive Rebase (launch in new Terminal)', value: this.config.dialogDefaults.rebase.interactive },
17531753
{ type: DialogInputType.Checkbox, name: 'Ignore Date', value: this.config.dialogDefaults.rebase.ignoreDate, info: 'Only applicable to a non-interactive rebase.' }
17541754
], 'Yes, rebase', (values) => {
17551755
let interactive = <boolean>values[0];

0 commit comments

Comments
 (0)