Merge /pub/scm/git/git to recover lost side branch