saltstack/salt — pull request #2595 by kuerzn (2012-11-16 21:37:29+00:00)
Title: Fix for #2582. Replaced git-pull with git-fetch; git-merge FETCH_HEAD.

Where the merge only happens, if there is a branch currently checked out. The whole function still needs to be checked for consistency in all tests and log messages