aboutsummaryrefslogtreecommitdiff
path: root/git-merge-one-file-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-01 23:50:51 -0700
committerJunio C Hamano <junkio@cox.net>2005-05-01 23:50:51 -0700
commit0ff5bf7cfcb20a6c2404fe7b9cc6ff18e47db812 (patch)
tree84cee1c0d23b36fdaf5d1a4a5785eb6d6f243b87 /git-merge-one-file-script
parent74400e7175e3dac994e75452973d78f6a42de65e (diff)
downloadgit-0ff5bf7cfcb20a6c2404fe7b9cc6ff18e47db812.tar.gz
git-0ff5bf7cfcb20a6c2404fe7b9cc6ff18e47db812.tar.xz
Implement git-update-cache --force-remove <path>
This new flag tells git-update-cache to remove the named path even when the work tree still happens to have the file. It is used to update git-merge-one-file-script not to smudge the work tree. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-one-file-script')
0 files changed, 0 insertions, 0 deletions