There is a function called cherry-pick ( http://www.kernel.org/pub/software/scm/git/docs/git-cherry-pick.html ) that could be used to merge only one commit. -- Fabio Alessandro Locati