当我做一个导致冲突的git merge --squash <source_branch> ，来自Git的预定义的提交消息内容仅包含冲突信息，而不包含压扁提交的摘要。
λ git merge --squash <source_branch> Auto-merging res/strings_us/c4d_strings.str CONFLICT (content): Merge conflict in res/strings_us/c4d_strings.str Auto-merging res/config.ini CONFLICT (content): Merge conflict in res/config.ini Auto-merging readme.md Squash commit -- not updating HEAD Automatic merge failed; fix conflicts and then commit the result. λ # resolve conflicts ... λ git add res λ git commit Conflicts: res/config.ini res/strings_us/c4d_strings.str # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch <branch_name> # Changes to be committed: # modified: res/config.ini # modified: res/strings_us/c4d_strings.str
我怎样才能让Git也包含已被压扁的提交信息？ 通常Git会写“下面提交的壁球：”，然后显示已经放入提交的提交的git log 。
使用git版本1.9.5.msysgit.1