DESCRIPTION

Merge branch 'stable-3.6'

* stable-3.6:
  Search running launch configuration in ModalContext
  Use appropriate constructor to create bare repository
  EGit v3.5.3.201412180710-r
  EGit v3.4.2.201412180340-r
  [stagingView] Add "Replace With > Ours/Theirs" menu for conflicts
  Support checking out stage with DiscardChangesOperation
  Make DiscardChangesOperation work for non-resources
  Add ProjectUtil.refreshRepositoryResources
  [stagingView] Don't forget amend state after repository refreshes
  Decorate symlinks properly according to their git status
  [stagingView] Enhance IndexDiffData to support submodules
  Revert "Add support for cherry-picking multiple commits at once"
  Revert "Show a rebase result dialog if cherry-picking fails."
  [stagingView] Compare against HEAD for conflicting files
  [historyView] Show name and email on hover of author/committer column
  [historyView] Show date columns in local time zone, original on hover
  Remove files from src.includes which aren't required in source build
  Optimize RevUtils.isContainedInAnyRef by not checking older refs
  Don't show "Running Launch" dialog again after "Checkout Conflicts"

Change-Id: Ieaa2b97d521efe18b3174f011ff1d4a05d6f4993
Signed-off-by: Douglas Trujillo xxx@xxx.xxx


COMMENTS

author: Douglas Trujillo
date: 2014-12-22 00:20:38.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2014-12-22 00:27:06.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/6565/

-------------------------------------
author: Brenden Conley
date: 2014-12-22 00:32:28.000000000

Patch Set 1: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/6565/ : SUCCESS

-------------------------------------
author: Douglas Trujillo
date: 2014-12-22 06:34:31.000000000

Patch Set 1: Code-Review+2

-------------------------------------
author: Douglas Trujillo
date: 2014-12-22 06:34:38.000000000

Change has been successfully merged into the git repository.

-------------------------------------
