Merge branch 'master' into stable-3.2
* master:
Show results in case of conflicts when rebase.autostash is true
Push Tags: Fix reveal code on Linux
Use "Rebase on" instead of "Rebase on Top of"
Rebase: Show dialog in case there are uncommitted changes
Show nice text in PullResultDialog in case of uncommitted changes
Push Branch wizard: Preselect remote if branch has one configured
Improve check box labels on push confirmation page
Push Branch: Fix "Show dialog only when result differs"
[repoView] Add dropping multiple stashed commits
Push Tags wizard
BranchSelectionDialog: Make resizable and sort elements
Fix label of "Create Tag..." in commit viewer
[historyView] Enable to run commands when input is in a closed project
Add a helper method to find repository from given resource path
Extract class for dialog to clean up uncommitted changes
Fix lock caused by concurrent access of GitResourceVariantTree
Make "Copy" command for reflog entries unambiguous
Use singular in Synchronize repositories column header
Unify "Add Spec" capitalization
Have a window title in RefSpecWizard
Avoid multiple head changed warnings in commit message.
Set window title in Clean wizard
Remove unused import
[findBugs] Fix reliance on default encoding
[repoView] Remove duplicate command and handler for "Create Tag..."
Fix typo in name of RepoViewConfigureBranchCommand
Use ellipsis in "Add Submodule..." menu
Reorder buttons in interactive rebase view
Use different icons for start/continue interactive rebase
Disable some menus and actions on bare repos
[stagingView] Shorten context menu to "Replace with Git Index"
Improve order of menu entries in "Replace With" menu
Blame annotations: Add link for showing commit in history and open
Blame annotations: Show start commit when opening editor
Use ResourceUtil for finding IFile for compare in commit dialog
Don't switch perspective in UI tests
Fix rebase triggered from Git Repositories View
Blame annotations: Show diff in hover and enable blaming parent commits
Extract method to get DiffEntry corresponding to a changed path
[historyView] Add Show In > History to file diff pane
Update Jetty to 7.6.14.v20131031
Improve rendering of file diffs in History view
Improve order of menu entries in "Compare With" menu
Remove Compare With > History...
Update file count on clearing filter
Git operations shouldn't lock on workspace level
Commit dialog: Add "Compare with HEAD revision" to file context menu
[repoView] Automatically share projects when adding existing repository
[stagingView] Ensure selection is correct for context menu entries
Change-Id: I090e3039a10d5465e19b80912d7a81052e519310
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>