Hi, please see http://bugs.debian.org/403104 Shouldn't git remove the original file after merging a commit that moved the file away? Here's a simple test case: $ mkdir repo && cd repo $ git init-db defaulting to local storage area $ echo a >foo && git add foo $ git commit -a -m'add foo' Committing initial tree 86de5e13286a8449a8a706a58e63be6781770b12 $ git branch b $ git mv foo bar $ git commit -a -m'move foo' $ git checkout b $ echo ttt >>foo $ git commit -a -m'change foo' $ git pull . master Trying really trivial in-index merge... fatal: Merge requires file-level merging Nope. Merging HEAD with adc07a8eac73cdb1cb3764ec50747556ed2abc99 Merging: 92eff19 change foo adc07a8 move foo found 1 common ancestor(s): ba043e5 add foo Merge made by recursive. foo => bar | 0 1 files changed, 0 insertions(+), 0 deletions(-) rename foo => bar (100%) $ git status # On branch refs/heads/b # Untracked files: # (use "git add" to add to commit) # # foo nothing to commit $ ls bar foo $ Thanks, Gerrit. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html