On Wed, Oct 28, 2009 at 13:01, Tim Mazid <timmazid@xxxxxxxxxxx> wrote: > You can just do a 'git branch branch-to-merge COMMIT' then 'git merge > branch-to-merge' from your feature branch. Alternatively, you could just do > a straight 'git merge COMMIT' from your feature branch. Though I'm not sure > of the consequences of merging a commit instead of a branch. The only consequence is that the merge commit message (if there will be any, fast-forward merges don't merge anything) will mention the SHA1 instead of branch name. You can provide your own merge commit message, of course (while merging and afterwards). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html