DESCRIPTION

Merge branch 'stable-3.1'

* stable-3.1:
  Prepare post 3.1.0 builds
  EGit v3.1.0.201310021548-r
  Update documentation for EGit 3.1.0
  Prepare post 3.1.0 RC1 builds
  EGit v3.1.0.201309270735-rc1
  Fix regression of switched sides in "Compare with Version in Ancestor"
  Cherry-pick with conflicts must not change author ident
  Fix cancel message for rebase continue
  [stagingView] Start with "auto expand" mode initially
  Add nice labels for merge/rebase result status
  Ensure that RepositoryPropertyPage fires ConfigChangedEvents
  Remove stale repository mappings
  Perform CRLF conversion when saving index in partial staging
  Fix NoWorkTreeException when having bare repo in repo view
  Don't include problematic file in LinkedResourcesTest
  [historyView] Include annotated tags with "Show All Branches and Tags"
  [stagingView] Fix selection after showing view initially

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


COMMENTS

author: Brenden Conley
date: 2013-10-03 18:27:48.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2013-10-03 18:28:12.000000000

Patch Set 1: Verified-1

Build Failed 

https://hudson.eclipse.org/egit/job/egit.gerrit/5002/ : FAILURE

-------------------------------------
author: Douglas Trujillo
date: 2013-10-03 18:29:16.000000000

Patch Set 1: Verified+1 Code-Review+2 IP-Clean+1

-------------------------------------
author: Douglas Trujillo
date: 2013-10-03 18:29:18.000000000

Change has been successfully merged into the git repository.

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