<fix>[.gitconfig]: recongnize remote branch merge
<fix>[.gitconfig]: recongnize remote branch merge

Change-Id: I737568786a6a74666567627365796264726e6b68

AlanJager/zstack,MatheMatrix/zstack,MatheMatrix/zstack,AlanJager/zstack,MatheMatrix/zstack,zstackio/zstack,AlanJager/zstack,zstackio/zstack,zstackio/zstack