Revise script to get rid of orig files

qgis · Apr 8, 2012 · 8465bdc · 8465bdc
1 parent 4590397
commit 8465bdc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/scripts/remove_git_confict_files.sh b/scripts/remove_git_confict_files.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+#
+# 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.
+#
+# Tim Sutton, May 2008
+find . -name "*.orig" -exec rm -rf {} \;
diff --git a/scripts/remove_svn_conflict_files.sh b/scripts/remove_svn_conflict_files.sh