MAINT: some git / .gitignore housekeeping

Makefile rule for removing .orig files left after git merges.

Deal with .orig files in freesurfer data directory.

Add some stuff to .gitignores.

Author: matthew-brett

.gitignore

@@ -15,9 +15,12 @@
 *.tmp
 .project
 .pydevproject
+*.py.orig
 
-# Not sure what the next two are for
+# Not sure what the next one is for
 *.kpf
+
+# Makefile target file markers
 *-stamp
 
 # Compiled source #
@@ -58,6 +61,7 @@ dist/
 .shelf
 .tox/
 .coverage
+.ropeproject/
 
 # Logs and databases #
 ######################

Makefile

@@ -284,5 +284,8 @@ tox-stale:
 refresh-readme:
 	$(PYTHON) tools/refresh_readme.py
 
-.PHONY: orig-src pylint
+rm-orig:
+	# Remove .orig temporary diff files generated by git
+	find . -name "*.orig" -print | grep -v "fsaverage" | xargs rm
 
+.PHONY: orig-src pylint

doc/source/notebooks/.gitignore

@@ -0,0 +1 @@
+.ipynb_checkpoints/