GIT resource improvement: support --strategy-option

[mgsolid]

"Currently, git resource supports rebase and merge but do not support options like --strategy-option. This is particularly helpful when concurrent builds are pushing changes to the same repository and there is a need to auto resolve conflicts as part of merge/rebase."