diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj
index fa3c9fd..e117e66 100644
--- a/GitX.xcodeproj/project.pbxproj
+++ b/GitX.xcodeproj/project.pbxproj
@@ -64,6 +64,9 @@
 		D85B939310E3D8B4007F3C28 /* PBCreateBranchSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = D85B939210E3D8B4007F3C28 /* PBCreateBranchSheet.xib */; };
 		D889EB3110E6BCBB00F08413 /* PBCreateTagSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = D889EB3010E6BCBB00F08413 /* PBCreateTagSheet.xib */; };
 		D8A4BB6F11337D5C00E92D51 /* PBGitGradientBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = D8A4BB6E11337D5C00E92D51 /* PBGitGradientBarView.m */; };
+		D8A4BD071134AD2900E92D51 /* CherryPickTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D8A4BD041134AD2900E92D51 /* CherryPickTemplate.png */; };
+		D8A4BD081134AD2900E92D51 /* MergeTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D8A4BD051134AD2900E92D51 /* MergeTemplate.png */; };
+		D8A4BD091134AD2900E92D51 /* RebaseTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = D8A4BD061134AD2900E92D51 /* RebaseTemplate.png */; };
 		D8E3B2B810DC9FB2001096A3 /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8E3B2B710DC9FB2001096A3 /* ScriptingBridge.framework */; };
 		D8E3B34D10DCA958001096A3 /* PBCreateTagSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = D8E3B34C10DCA958001096A3 /* PBCreateTagSheet.m */; };
 		D8FDD9F711432A12005647F6 /* PBCloneRepositoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = D8FDD9F511432A12005647F6 /* PBCloneRepositoryPanel.xib */; };
@@ -271,6 +274,9 @@
 		D85B93F610E51279007F3C28 /* PBGitRefish.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRefish.h; sourceTree = "<group>"; };
 		D8A4BB6D11337D5C00E92D51 /* PBGitGradientBarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitGradientBarView.h; sourceTree = "<group>"; };
 		D8A4BB6E11337D5C00E92D51 /* PBGitGradientBarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitGradientBarView.m; sourceTree = "<group>"; };
+		D8A4BD041134AD2900E92D51 /* CherryPickTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CherryPickTemplate.png; path = Images/CherryPickTemplate.png; sourceTree = "<group>"; };
+		D8A4BD051134AD2900E92D51 /* MergeTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = MergeTemplate.png; path = Images/MergeTemplate.png; sourceTree = "<group>"; };
+		D8A4BD061134AD2900E92D51 /* RebaseTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RebaseTemplate.png; path = Images/RebaseTemplate.png; sourceTree = "<group>"; };
 		D8C1B77210E875CF009B7F8B /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PBRemoteProgressSheet.xib; sourceTree = "<group>"; };
 		D8E3B2B710DC9FB2001096A3 /* ScriptingBridge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ScriptingBridge.framework; path = /System/Library/Frameworks/ScriptingBridge.framework; sourceTree = "<absolute>"; };
 		D8E3B34B10DCA958001096A3 /* PBCreateTagSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBCreateTagSheet.h; sourceTree = "<group>"; };
@@ -520,6 +526,9 @@
 				D828A5F01128AE7200F09D11 /* PullTemplate.png */,
 				D828A5F11128AE7200F09D11 /* PushTemplate.png */,
 				3BC07F4A0ED5A5C5009A7768 /* HistoryViewTemplate.png */,
+				D8A4BD041134AD2900E92D51 /* CherryPickTemplate.png */,
+				D8A4BD051134AD2900E92D51 /* MergeTemplate.png */,
+				D8A4BD061134AD2900E92D51 /* RebaseTemplate.png */,
 				3BC07F4B0ED5A5C5009A7768 /* CommitViewTemplate.png */,
 				F56ADDD70ED19F9E002AC78F /* AddBranchTemplate.png */,
 				F56ADDD80ED19F9E002AC78F /* AddLabelTemplate.png */,
@@ -1009,6 +1018,9 @@
 				D828A5F31128AE7200F09D11 /* PullTemplate.png in Resources */,
 				D828A5F41128AE7200F09D11 /* PushTemplate.png in Resources */,
 				D8FDDBF41143F318005647F6 /* AddRemote.png in Resources */,
+				D8A4BD071134AD2900E92D51 /* CherryPickTemplate.png in Resources */,
+				D8A4BD081134AD2900E92D51 /* MergeTemplate.png in Resources */,
+				D8A4BD091134AD2900E92D51 /* RebaseTemplate.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Images/AddBranchTemplate.png b/Images/AddBranchTemplate.png
index bd58596..03161a0 100644
Binary files a/Images/AddBranchTemplate.png and b/Images/AddBranchTemplate.png differ
diff --git a/Images/AddLabelTemplate.png b/Images/AddLabelTemplate.png
index 5823711..085e760 100644
Binary files a/Images/AddLabelTemplate.png and b/Images/AddLabelTemplate.png differ
diff --git a/Images/CherryPickTemplate.png b/Images/CherryPickTemplate.png
new file mode 100644
index 0000000..7a49968
Binary files /dev/null and b/Images/CherryPickTemplate.png differ
diff --git a/Images/MergeTemplate.png b/Images/MergeTemplate.png
new file mode 100644
index 0000000..f3d24c9
Binary files /dev/null and b/Images/MergeTemplate.png differ
diff --git a/Images/RebaseTemplate.png b/Images/RebaseTemplate.png
new file mode 100644
index 0000000..87d8390
Binary files /dev/null and b/Images/RebaseTemplate.png differ
diff --git a/PBGitHistoryController.h b/PBGitHistoryController.h
index 1d059c3..2ace6c5 100644
--- a/PBGitHistoryController.h
+++ b/PBGitHistoryController.h
@@ -24,7 +24,12 @@
 	IBOutlet NSOutlineView* fileBrowser;
 	IBOutlet NSTableView* commitList;
 	IBOutlet PBCollapsibleSplitView *historySplitView;
+
 	IBOutlet PBGitGradientBarView *upperToolbarView;
+	IBOutlet NSButton *mergeButton;
+	IBOutlet NSButton *cherryPickButton;
+	IBOutlet NSButton *rebaseButton;
+
 	IBOutlet PBGitGradientBarView *scopeBarView;
 
 	IBOutlet id webView;
@@ -63,6 +68,9 @@
 - (IBAction) createBranch:(id)sender;
 - (IBAction) createTag:(id)sender;
 - (IBAction) showAddRemoteSheet:(id)sender;
+- (IBAction) merge:(id)sender;
+- (IBAction) cherryPick:(id)sender;
+- (IBAction) rebase:(id)sender;
 
 - (void) copyCommitInfo;
 
diff --git a/PBGitHistoryController.m b/PBGitHistoryController.m
index 3157f3d..79b77c3 100644
--- a/PBGitHistoryController.m
+++ b/PBGitHistoryController.m
@@ -80,7 +80,12 @@
 		case 0:	self.webCommit = realCommit;			break;
 		case 1:	self.gitTree   = realCommit.tree;	break;
 	}
-}	
+
+	BOOL isOnHeadBranch = [realCommit isOnHeadBranch];
+	[mergeButton setEnabled:!isOnHeadBranch];
+	[cherryPickButton setEnabled:!isOnHeadBranch];
+	[rebaseButton setEnabled:!isOnHeadBranch];
+}
 
 
 - (void) setSelectedTab: (int) number
@@ -379,4 +384,25 @@
 	[PBAddRemoteSheet beginAddRemoteSheetForRepository:self.repository];
 }
 
+- (IBAction) merge:(id)sender
+{
+	if (realCommit)
+		[repository mergeWithRefish:realCommit];
+}
+
+- (IBAction) cherryPick:(id)sender
+{
+	if (realCommit)
+		[repository cherryPickRefish:realCommit];
+}
+
+- (IBAction) rebase:(id)sender
+{
+	if (realCommit) {
+		PBGitRef *headRef = [[repository headRef] ref];
+		[repository rebaseBranch:headRef onRefish:realCommit];
+	}
+}
+	
+
 @end
diff --git a/PBGitHistoryView.xib b/PBGitHistoryView.xib
index 6a67914..56e35fd 100644
--- a/PBGitHistoryView.xib
+++ b/PBGitHistoryView.xib
@@ -21,7 +21,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="312"/>
+			<integer value="316"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -217,6 +217,136 @@
 						<int key="NSvFlags">266</int>
 						<object class="NSMutableArray" key="NSSubviews">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="NSCustomView" id="564066926">
+								<reference key="NSNextResponder" ref="172148644"/>
+								<int key="NSvFlags">269</int>
+								<object class="NSMutableArray" key="NSSubviews">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<object class="NSButton" id="258088911">
+										<reference key="NSNextResponder" ref="564066926"/>
+										<int key="NSvFlags">268</int>
+										<string key="NSFrame">{{110, 3}, {37, 25}}</string>
+										<reference key="NSSuperview" ref="564066926"/>
+										<bool key="NSEnabled">YES</bool>
+										<object class="NSButtonCell" key="NSCell" id="760195759">
+											<int key="NSCellFlags">-2080244224</int>
+											<int key="NSCellFlags2">134217728</int>
+											<string key="NSContents">Rebase</string>
+											<reference key="NSSupport" ref="924107556"/>
+											<reference key="NSControlView" ref="258088911"/>
+											<int key="NSButtonFlags">-2033958657</int>
+											<int key="NSButtonFlags2">163</int>
+											<object class="NSCustomResource" key="NSNormalImage">
+												<string key="NSClassName">NSImage</string>
+												<string key="NSResourceName">RebaseTemplate</string>
+											</object>
+											<string key="NSAlternateContents"/>
+											<string key="NSKeyEquivalent"/>
+											<int key="NSPeriodicDelay">400</int>
+											<int key="NSPeriodicInterval">75</int>
+										</object>
+									</object>
+									<object class="NSButton" id="1006113529">
+										<reference key="NSNextResponder" ref="564066926"/>
+										<int key="NSvFlags">268</int>
+										<string key="NSFrame">{{65, 3}, {37, 25}}</string>
+										<reference key="NSSuperview" ref="564066926"/>
+										<bool key="NSEnabled">YES</bool>
+										<object class="NSButtonCell" key="NSCell" id="772225018">
+											<int key="NSCellFlags">-2080244224</int>
+											<int key="NSCellFlags2">134217728</int>
+											<string key="NSContents">Cherry Pick</string>
+											<reference key="NSSupport" ref="924107556"/>
+											<reference key="NSControlView" ref="1006113529"/>
+											<int key="NSButtonFlags">-2033958657</int>
+											<int key="NSButtonFlags2">163</int>
+											<object class="NSCustomResource" key="NSNormalImage">
+												<string key="NSClassName">NSImage</string>
+												<string key="NSResourceName">CherryPickTemplate</string>
+											</object>
+											<string key="NSAlternateContents"/>
+											<string key="NSKeyEquivalent"/>
+											<int key="NSPeriodicDelay">400</int>
+											<int key="NSPeriodicInterval">75</int>
+										</object>
+									</object>
+									<object class="NSButton" id="502319102">
+										<reference key="NSNextResponder" ref="564066926"/>
+										<int key="NSvFlags">268</int>
+										<string key="NSFrame">{{20, 3}, {37, 25}}</string>
+										<reference key="NSSuperview" ref="564066926"/>
+										<bool key="NSEnabled">YES</bool>
+										<object class="NSButtonCell" key="NSCell" id="934102630">
+											<int key="NSCellFlags">-2080244224</int>
+											<int key="NSCellFlags2">134217728</int>
+											<string key="NSContents">Merge</string>
+											<reference key="NSSupport" ref="924107556"/>
+											<reference key="NSControlView" ref="502319102"/>
+											<int key="NSButtonFlags">-2033958657</int>
+											<int key="NSButtonFlags2">163</int>
+											<object class="NSCustomResource" key="NSNormalImage">
+												<string key="NSClassName">NSImage</string>
+												<string key="NSResourceName">MergeTemplate</string>
+											</object>
+											<string key="NSAlternateContents"/>
+											<string key="NSKeyEquivalent"/>
+											<int key="NSPeriodicDelay">400</int>
+											<int key="NSPeriodicInterval">75</int>
+										</object>
+									</object>
+								</object>
+								<string key="NSFrame">{{342, 0}, {167, 30}}</string>
+								<reference key="NSSuperview" ref="172148644"/>
+								<string key="NSClassName">NSView</string>
+							</object>
+							<object class="NSButton" id="107487665">
+								<reference key="NSNextResponder" ref="172148644"/>
+								<int key="NSvFlags">268</int>
+								<string key="NSFrame">{{55, 3}, {37, 25}}</string>
+								<reference key="NSSuperview" ref="172148644"/>
+								<bool key="NSEnabled">YES</bool>
+								<object class="NSButtonCell" key="NSCell" id="794901717">
+									<int key="NSCellFlags">-2080244224</int>
+									<int key="NSCellFlags2">134217728</int>
+									<string key="NSContents">Create Tag</string>
+									<reference key="NSSupport" ref="924107556"/>
+									<reference key="NSControlView" ref="107487665"/>
+									<int key="NSButtonFlags">-2033958657</int>
+									<int key="NSButtonFlags2">163</int>
+									<object class="NSCustomResource" key="NSNormalImage">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">AddLabelTemplate</string>
+									</object>
+									<string key="NSAlternateContents"/>
+									<string key="NSKeyEquivalent"/>
+									<int key="NSPeriodicDelay">400</int>
+									<int key="NSPeriodicInterval">75</int>
+								</object>
+							</object>
+							<object class="NSButton" id="1051155594">
+								<reference key="NSNextResponder" ref="172148644"/>
+								<int key="NSvFlags">268</int>
+								<string key="NSFrame">{{10, 3}, {37, 25}}</string>
+								<reference key="NSSuperview" ref="172148644"/>
+								<bool key="NSEnabled">YES</bool>
+								<object class="NSButtonCell" key="NSCell" id="870128015">
+									<int key="NSCellFlags">-2080244224</int>
+									<int key="NSCellFlags2">134217728</int>
+									<string key="NSContents">Create Branch</string>
+									<reference key="NSSupport" ref="924107556"/>
+									<reference key="NSControlView" ref="1051155594"/>
+									<int key="NSButtonFlags">-2033958657</int>
+									<int key="NSButtonFlags2">163</int>
+									<object class="NSCustomResource" key="NSNormalImage">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">AddBranchTemplate</string>
+									</object>
+									<string key="NSAlternateContents"/>
+									<string key="NSKeyEquivalent"/>
+									<int key="NSPeriodicDelay">400</int>
+									<int key="NSPeriodicInterval">75</int>
+								</object>
+							</object>
 							<object class="NSBox" id="923983319">
 								<reference key="NSNextResponder" ref="172148644"/>
 								<int key="NSvFlags">10</int>
@@ -1615,6 +1745,70 @@
 					</object>
 					<int key="connectionID">329</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">createTag:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="107487665"/>
+					</object>
+					<int key="connectionID">334</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">createBranch:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1051155594"/>
+					</object>
+					<int key="connectionID">335</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">merge:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="502319102"/>
+					</object>
+					<int key="connectionID">349</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cherryPick:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1006113529"/>
+					</object>
+					<int key="connectionID">350</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">rebase:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="258088911"/>
+					</object>
+					<int key="connectionID">351</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">mergeButton</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="502319102"/>
+					</object>
+					<int key="connectionID">352</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">cherryPickButton</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1006113529"/>
+					</object>
+					<int key="connectionID">353</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">rebaseButton</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="258088911"/>
+					</object>
+					<int key="connectionID">354</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -2017,6 +2211,9 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="923983319"/>
+							<reference ref="1051155594"/>
+							<reference ref="107487665"/>
+							<reference ref="564066926"/>
 						</object>
 						<reference key="parent" ref="319362431"/>
 						<string key="objectName">History Upper Toolbar</string>
@@ -2031,6 +2228,87 @@
 						<reference key="object" ref="147470634"/>
 						<reference key="parent" ref="24227530"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">330</int>
+						<reference key="object" ref="1051155594"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="870128015"/>
+						</object>
+						<reference key="parent" ref="172148644"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">331</int>
+						<reference key="object" ref="870128015"/>
+						<reference key="parent" ref="1051155594"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">332</int>
+						<reference key="object" ref="107487665"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="794901717"/>
+						</object>
+						<reference key="parent" ref="172148644"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">333</int>
+						<reference key="object" ref="794901717"/>
+						<reference key="parent" ref="107487665"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">336</int>
+						<reference key="object" ref="564066926"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="502319102"/>
+							<reference ref="1006113529"/>
+							<reference ref="258088911"/>
+						</object>
+						<reference key="parent" ref="172148644"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">337</int>
+						<reference key="object" ref="502319102"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="934102630"/>
+						</object>
+						<reference key="parent" ref="564066926"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">338</int>
+						<reference key="object" ref="934102630"/>
+						<reference key="parent" ref="502319102"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">340</int>
+						<reference key="object" ref="1006113529"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="772225018"/>
+						</object>
+						<reference key="parent" ref="564066926"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">341</int>
+						<reference key="object" ref="772225018"/>
+						<reference key="parent" ref="1006113529"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">343</int>
+						<reference key="object" ref="258088911"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="760195759"/>
+						</object>
+						<reference key="parent" ref="564066926"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">344</int>
+						<reference key="object" ref="760195759"/>
+						<reference key="parent" ref="258088911"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2089,7 +2367,23 @@
 					<string>32.ImportedFromIB2</string>
 					<string>327.IBPluginDependency</string>
 					<string>33.IBPluginDependency</string>
+					<string>330.IBAttributePlaceholdersKey</string>
+					<string>330.IBPluginDependency</string>
+					<string>331.IBPluginDependency</string>
+					<string>332.IBAttributePlaceholdersKey</string>
+					<string>332.IBPluginDependency</string>
+					<string>333.IBPluginDependency</string>
+					<string>336.IBPluginDependency</string>
+					<string>337.IBAttributePlaceholdersKey</string>
+					<string>337.IBPluginDependency</string>
+					<string>338.IBPluginDependency</string>
 					<string>34.IBPluginDependency</string>
+					<string>340.IBAttributePlaceholdersKey</string>
+					<string>340.IBPluginDependency</string>
+					<string>341.IBPluginDependency</string>
+					<string>343.IBAttributePlaceholdersKey</string>
+					<string>343.IBPluginDependency</string>
+					<string>344.IBPluginDependency</string>
 					<string>35.CustomClassName</string>
 					<string>35.IBPluginDependency</string>
 					<string>35.ImportedFromIB2</string>
@@ -2171,6 +2465,57 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSMutableDictionary">
+						<string key="NS.key.0">ToolTip</string>
+						<object class="IBToolTipAttribute" key="NS.object.0">
+							<string key="name">ToolTip</string>
+							<reference key="object" ref="1051155594"/>
+							<string key="toolTip">Create Branch</string>
+						</object>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSMutableDictionary">
+						<string key="NS.key.0">ToolTip</string>
+						<object class="IBToolTipAttribute" key="NS.object.0">
+							<string key="name">ToolTip</string>
+							<reference key="object" ref="107487665"/>
+							<string key="toolTip">Create Tag</string>
+						</object>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSMutableDictionary">
+						<string key="NS.key.0">ToolTip</string>
+						<object class="IBToolTipAttribute" key="NS.object.0">
+							<string key="name">ToolTip</string>
+							<reference key="object" ref="502319102"/>
+							<string key="toolTip">Merge</string>
+						</object>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSMutableDictionary">
+						<string key="NS.key.0">ToolTip</string>
+						<object class="IBToolTipAttribute" key="NS.object.0">
+							<string key="name">ToolTip</string>
+							<reference key="object" ref="1006113529"/>
+							<string key="toolTip">Cherry Pick</string>
+						</object>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSMutableDictionary">
+						<string key="NS.key.0">ToolTip</string>
+						<object class="IBToolTipAttribute" key="NS.object.0">
+							<string key="name">ToolTip</string>
+							<reference key="object" ref="258088911"/>
+							<string key="toolTip">Rebase</string>
+						</object>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>PBGitRevisionCell</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2216,7 +2561,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">329</int>
+			<int key="maxID">354</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2282,10 +2627,13 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>cherryPick:</string>
 							<string>createBranch:</string>
 							<string>createTag:</string>
+							<string>merge:</string>
 							<string>openFilesAction:</string>
 							<string>openSelectedFile:</string>
+							<string>rebase:</string>
 							<string>refresh:</string>
 							<string>setDetailedView:</string>
 							<string>setRawView:</string>
@@ -2309,16 +2657,22 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>cherryPickButton</string>
 							<string>commitController</string>
 							<string>commitList</string>
 							<string>fileBrowser</string>
 							<string>historySplitView</string>
+							<string>mergeButton</string>
+							<string>rebaseButton</string>
 							<string>refController</string>
 							<string>scopeBarView</string>
 							<string>searchField</string>
@@ -2328,10 +2682,13 @@
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSButton</string>
 							<string>NSArrayController</string>
 							<string>NSTableView</string>
 							<string>NSOutlineView</string>
 							<string>PBCollapsibleSplitView</string>
+							<string>NSButton</string>
+							<string>NSButton</string>
 							<string>PBRefController</string>
 							<string>PBGitGradientBarView</string>
 							<string>NSSearchField</string>
@@ -3275,8 +3632,25 @@
 		<string key="IBDocument.LastKnownRelativeProjectPath">GitX.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NS.key.0">NSQuickLookTemplate</string>
-			<string key="NS.object.0">{19, 11}</string>
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>AddBranchTemplate</string>
+				<string>AddLabelTemplate</string>
+				<string>CherryPickTemplate</string>
+				<string>MergeTemplate</string>
+				<string>NSQuickLookTemplate</string>
+				<string>RebaseTemplate</string>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>{20, 12}</string>
+				<string>{23, 12}</string>
+				<string>{18.5143, 12.3429}</string>
+				<string>{16.4571, 12.3429}</string>
+				<string>{19, 11}</string>
+				<string>{16.4571, 13.3714}</string>
+			</object>
 		</object>
 	</data>
 </archive>