Add *~, *.rej, *.orig files to git ignore list.