Git References

To merge part of a branch for example part of dspace_5-x, https://stackoverflow.com/questions/449541/how-to-selectively-merge-or-pick-changes-from-another-branch-in-git

git checkout feature
git checkout -b temp
git rebase -i master
... (after rebase)
git checkout master
git pull . temp
git branch -d temp