I had earlier pulled a branch from master and while working I mistakenly changed the file and directory permissions. Will those changes be reflected in master while merging even though the directory permission changes are not being showed in "git diff"?
edit: I'm working on a Linux machine.