sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update remove_git_conflict_files script to also remove *.prepare

Browse Source 
Also rename script to remove_temporary_files.sh to reflect this
change.
This commit is contained in:
Nyall Dawson 2015-06-21 14:06:24 +10:00
parent cb7f9b4cf7
commit f9387ca3cf
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/remove_git_confict_files.sh → scripts/remove_temporary_files.sh
View File

@ -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 QGIS related temporary files left in
# your QGIS source folder by git and the prepare-commit script.
#
# 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 {} \;
find . -name "*.prepare" -exec rm -rf {} \;