Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Sawicki2011-08-04 23:54:06 +0000
committerKevin Sawicki2011-08-04 23:54:06 +0000
commitbda8eb44433cdc4d310586a9f046f3fcadf02019 (patch)
treec744d0d453acec3b1f119477309270f13c6d5054 /org.eclipse.mylyn.github.ui/plugin.properties
parente275463ab1ef6f424539591260b94dfed3651508 (diff)
downloadegit-github-bda8eb44433cdc4d310586a9f046f3fcadf02019.tar.gz
egit-github-bda8eb44433cdc4d310586a9f046f3fcadf02019.tar.xz
egit-github-bda8eb44433cdc4d310586a9f046f3fcadf02019.zip
Add support for rebasing and merging pull requests.
Pull request editor now has actions to rebase pull request topic branch onto tip of destination branch and also merge topic branch into destination branch. Change-Id: I271e6b6f78d5706748f0eb844d73d9ae25347787 Signed-off-by: Kevin Sawicki <kevin@github.com>
Diffstat (limited to 'org.eclipse.mylyn.github.ui/plugin.properties')
-rw-r--r--org.eclipse.mylyn.github.ui/plugin.properties6
1 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.mylyn.github.ui/plugin.properties b/org.eclipse.mylyn.github.ui/plugin.properties
index 64d3c381..ebc9d4b4 100644
--- a/org.eclipse.mylyn.github.ui/plugin.properties
+++ b/org.eclipse.mylyn.github.ui/plugin.properties
@@ -15,4 +15,8 @@ pullRequestConnectorUi=GitHub Pull Requests
checkoutPullRequest.name=Checkout Pull Request
checkoutPullRequest.description=Checkout pull request into topic branch
fetchPullRequest.name=Fetch Pull Request Commits
-fetchPullRequest.description=Fetch commits from pull request \ No newline at end of file
+fetchPullRequest.description=Fetch commits from pull request
+mergePullRequest.name=Merge pull request
+mergePullRequest.description=Merge into destination branch
+rebasePullRequest.name=Rebase pull request
+rebasePullRequest.description=Rebase onto destination branch \ No newline at end of file

Back to the top