Recording merge technique in git history