Merge branch 'cb/assume-unchanged-fix' into maint

* cb/assume-unchanged-fix: Documentation: git-add does not update files marked "assume unchanged" do not overwrite files marked "assume unchanged"