@@ -716,7 +716,7 @@ - (IBAction)pushToRemote:(id)sender
716
716
717
717
- (IBAction )merge : (id )sender
718
718
{
719
- id <PBGitRefish> refish = [self refishForSender: sender refishTypes: @[kGitXBranchType , kGitXCommitType , kGitXTagType ]];
719
+ id <PBGitRefish> refish = [self refishForSender: sender refishTypes: @[kGitXBranchType , kGitXRemoteBranchType , kGitXCommitType , kGitXTagType ]];
720
720
if (!refish) return ;
721
721
722
722
NSError *error = nil ;
@@ -728,8 +728,8 @@ - (IBAction)merge:(id)sender
728
728
729
729
- (IBAction )checkout : (id )sender
730
730
{
731
- id <PBGitRefish> refish = [self refishForSender: sender refishTypes: @[kGitXBranchType , kGitXCommitType , kGitXTagType ]];
732
- if (!selectedCommits ) return ;
731
+ id <PBGitRefish> refish = [self refishForSender: sender refishTypes: @[kGitXBranchType , kGitXRemoteBranchType , kGitXCommitType , kGitXTagType ]];
732
+ if (!refish ) return ;
733
733
734
734
NSError *error = nil ;
735
735
BOOL success = [repository checkoutRefish: refish error: &error];
@@ -752,7 +752,7 @@ - (IBAction)cherryPick:(id)sender
752
752
753
753
- (IBAction )rebase : (id )sender
754
754
{
755
- id <PBGitRefish> refish = [self refishForSender: sender refishTypes: @[kGitXBranchType ]];
755
+ id <PBGitRefish> refish = [self refishForSender: sender refishTypes: @[kGitXBranchType , kGitXRemoteBranchType ]];
756
756
if (!refish) return ;
757
757
758
758
NSError *error = nil ;
@@ -764,7 +764,7 @@ - (IBAction)rebase:(id)sender
764
764
765
765
- (IBAction ) rebaseHeadBranch : (id )sender
766
766
{
767
- id <PBGitRefish> refish = [self refishForSender: sender refishTypes: @[kGitXBranchType ]];
767
+ id <PBGitRefish> refish = [self refishForSender: sender refishTypes: @[kGitXBranchType , kGitXRemoteBranchType ]];
768
768
NSError *error = nil ;
769
769
BOOL success = [self .repository rebaseBranch: nil onRefish: refish error: &error];
770
770
if (!success) {
0 commit comments