kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Rebasing the head ref

Browse Source 
Only use the ref being rebased onto otherwise git will create a detached HEAD.
This commit is contained in:
Nathan Kinsinger
2010-09-19 10:51:03 -06:00
parent 9a9de9577c
commit 6f83f2382c
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PBGitHistoryController.m
+2 -4
View File
@@ -671,10 +671,8 @@
- (IBAction) rebase:(id)sender
{
if (selectedCommit) {
PBGitRef *headRef = [[repository headRef] ref];
[repository rebaseBranch:headRef onRefish:selectedCommit];
}
if (selectedCommit)
[repository rebaseBranch:nil onRefish:selectedCommit];
}
#pragma mark -
PBRefController.m
+1 -2
View File
@@ -147,9 +147,8 @@
- (void) rebaseHeadBranch:(PBRefMenuItem *)sender
{
id <PBGitRefish> refish = [sender refish];
PBGitRef *headRef = [[historyController.repository headRef] ref];
[historyController.repository rebaseBranch:headRef onRefish:refish];
[historyController.repository rebaseBranch:nil onRefish:refish];
}