2 ###########################################################################
3 # remove_git_confict_files.sh
4 # ---------------------
6 # Copyright : (C) 2012 by Tim Sutton
7 # Email : tim at kartoza dot com
8 ###########################################################################
10 # This program is free software; you can redistribute it and/or modify #
11 # it under the terms of the GNU General Public License as published by #
12 # the Free Software Foundation; either version 2 of the License, or #
13 # (at your option) any later version. #
15 ###########################################################################
18 # A simple script to get rid of QGIS related temporary files left in
19 # your QGIS source folder by git
21 # Tim Sutton, May 2008
25 -o -name "*.prepare" \
26 -o -name "*.sortinc" \
27 -o -name "*.unify_includes_modified" \
28 -o -name "*.nocopyright" \
29 -o -name "astyle*.diff" \
30 -o -name "sha-*.diff" \
32 -o -name "sha*.diff" \