| commit | 8ada6f7964642ea8ce50c42eaa5ecc1e234e36f6 | |
| author | Stefan Lay <stefan.lay@sap.com> | |
| Thu, 20 May 2010 13:33:33 +0000 (20 15:33 +0200) | ||
| committer | Chris Aniszczyk <caniszczyk@gmail.com> | |
| Mon, 24 May 2010 13:45:36 +0000 (24 08:45 -0500) | ||
| tree | 0190f23b5afd8592d7e2b8f0097130f36c9445c3 | treesnapshot (tar.gz zip) |
| parent | 6a8ab1f3a134fae58bd0ead134bbf967efa2fd5c | commitdiff |
Add action to trigger (fast-forward) merge
Add a new action to the team menu which opens
a merge dialog where a branch can be selected.
Currently jgit supports only fast-forward merges,
therefore the action label is "Fast-forward merge..."
In order to achieve better reuse the BranchSelectionDialog
is refactored.
Change-Id: I3a97d262fd4032d8cc045e94429608b49a937c0f
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Add a new action to the team menu which opens
a merge dialog where a branch can be selected.
Currently jgit supports only fast-forward merges,
therefore the action label is "Fast-forward merge..."
In order to achieve better reuse the BranchSelectionDialog
is refactored.
Change-Id: I3a97d262fd4032d8cc045e94429608b49a937c0f
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
15 files changed:
