文件操作 - git-merge-ours.sh
返回文件管理
返回主菜单
删除本文件
文件: /usr/share/doc/git-1.8.3.1/contrib/examples/git-merge-ours.sh
编辑文件内容
#!/bin/sh # # Copyright (c) 2005 Junio C Hamano # # Pretend we resolved the heads, but declare our tree trumps everybody else. # # We need to exit with 2 if the index does not match our HEAD tree, # because the current index is what we will be committing as the # merge result. git diff-index --quiet --cached HEAD -- || exit 2 exit 0
修改文件时间
将文件时间修改为当前时间的前一年
删除文件