| commit | 587fafd588f9cb429a8d740ba9abc9d766a570b9 | |
| author | Matthias Sohn <matthias.sohn@sap.com> | |
| Thu, 7 Apr 2016 11:12:39 +0000 (7 13:12 +0200) | ||
| committer | Matthias Sohn <matthias.sohn@sap.com> | |
| Thu, 7 Apr 2016 11:12:59 +0000 (7 13:12 +0200) | ||
| tree | 8de7005f39089cbadfbd21c73ccb18e444b0e86a | treesnapshot (tar.gz zip) |
| parent | c02cd196b41da3bbe241d108e5f196149b386c81 | commitdiff |
| parent | fbe70bcf1fb6dfd0fbb661653d625de78e0698eb | commitdiff |
Merge branch 'master' into stable-4.3
* master:
For asynchronous dialogs, use the topmost modal shell
Fix compile error in GitCompareFileRevisionEditorInput
When running "Commit" action open staging view instead of commit dialog
Auto-switch between horizontal and vertical StagingView layout
Move EclipseAuthenticator and EclipseProxySelector to egit.core
Move EclipseSshSessionFactory to org.eclipse.egit.core
Diff error message should mention that the error is from Git
Distinguish unchanged/deleted files in logical models
Change-Id: I196cb3158eca8e6a2aca60dba7d47085a6ad8997
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* master:
For asynchronous dialogs, use the topmost modal shell
Fix compile error in GitCompareFileRevisionEditorInput
When running "Commit" action open staging view instead of commit dialog
Auto-switch between horizontal and vertical StagingView layout
Move EclipseAuthenticator and EclipseProxySelector to egit.core
Move EclipseSshSessionFactory to org.eclipse.egit.core
Diff error message should mention that the error is from Git
Distinguish unchanged/deleted files in logical models
Change-Id: I196cb3158eca8e6a2aca60dba7d47085a6ad8997
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>