Update remove_git_conflict_files script to also remove *.prepare

Also rename script to remove_temporary_files.sh to reflect this change.
qgis · Jun 21, 2015 · f9387ca · f9387ca
1 parent cb7f9b4
commit f9387ca
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/scripts/remove_git_confict_files.sh → scripts/remove_temporary_files.sh b/scripts/remove_git_confict_files.sh → scripts/remove_temporary_files.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ###########################################################################
-#    remove_git_confict_files.sh
+#    remove_temporary_files.sh
 #    ---------------------
 #    Date                 : April 2012
 #    Copyright            : (C) 2012 by Tim Sutton
@@ -14,11 +14,10 @@
 #                                                                         #
 ###########################################################################
 
-
-#
-# A simple script to get rid of .orig and .rej files left in 
-# your repository by svn. It will request confirmation before 
-# deleting each file.
 #
+# A simple script to get rid of QGIS related temporary files left in 
+# your QGIS source folder by git and the prepare-commit script.
+
 # Tim Sutton, May 2008
 find . -name "*.orig" -exec rm -rf {} \;
+find . -name "*.prepare" -exec rm -rf {} \;