Merge branch 'js/rebase'

diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index da9da9218065678a5f223143e3d3de2b928e7114..0a97b75288d44cf93e0a8f8d9ab1b76715f946d1 100755 (executable)
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -84,6 +84,10 @@ test_expect_success \
     'When the rm in "git-rm -f" fails, it should not remove the file from the index' \
     'git-ls-files --error-unmatch baz'
 
+test_expect_success 'Remove nonexistent file with --ignore-unmatch' '
+       git rm --ignore-unmatch nonexistent
+'
+
 test_expect_success '"rm" command printed' '
        echo frotz > test-file &&
        git add test-file &&