Skip to content

Commit

Permalink
change 'commit to branch' to 'switch branch'
Browse files Browse the repository at this point in the history
  • Loading branch information
yysun committed Sep 9, 2011
1 parent 7d9504e commit 92dd14a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
10 changes: 6 additions & 4 deletions PendingChangesView.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,12 @@ internal void CommitToBranch()
if (this.tracker == null || this.tracker.Repository == null) return;

var branchPicker = new BranchPicker(this.tracker.Repository);
if (HasComments() && StageSelectedFiles() && branchPicker.Show() == true)
{
Commit();
}
branchPicker.Show();

//if (HasComments() && StageSelectedFiles() && branchPicker.Show() == true)
//{
// Commit();
//}
}

private bool StageSelectedFiles()
Expand Down
2 changes: 1 addition & 1 deletion PkgCmd.vsct
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>IconAndText</CommandFlag>
<Strings>
<ButtonText>Commit to Branch ...</ButtonText>
<ButtonText>Switch Branch ...</ButtonText>
</Strings>
</Button>

Expand Down
2 changes: 1 addition & 1 deletion UI/BranchPicker.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public BranchPicker(Repository repository)
{
window = new Window
{
Title = "Select a branch",
Title = "Switch (checkout) branch",
Content = this,
WindowStartupLocation = WindowStartupLocation.CenterScreen,
ResizeMode = System.Windows.ResizeMode.NoResize,
Expand Down
2 changes: 1 addition & 1 deletion source.extension.vsixmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Identifier Id="C4128D99-2000-41D1-A6C3-704E6C1A3DE2">
<Name>Git Source Control Provider</Name>
<Author>[email protected]</Author>
<Version>0.7.2</Version>
<Version>0.7.3</Version>
<Description xml:space="preserve">Git Source Control Provider is a plug-in that integrates git with Visual Studio.</Description>
<Locale>1033</Locale>
<License>License.txt</License>
Expand Down

0 comments on commit 92dd14a

Please sign in to comment.