From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 9 Aug 2012 18:02:01 +0000 (+0100)
Subject: refresh
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7be436a94cc1a4c5dd7ae1fff08ccce9cad3fe5b;p=marlin.git

refresh
---

diff --git a/meta b/meta
index 4328692..4440166 100644
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 68eae878b6c1d064a75e2bfd27d9bf46c5ad9681
-Head: a0ed05092019e8b1bc4d673a1fd163417a533792
+Previous: e3b322df844cf324ff0d276da6f06f4090cc6a44
+Head: 6a0fad50983c4fb5b60173ae96a6eb96ae9d4976
 Applied:
   marlin-pde-include-comment-for: 121f976406e6921f5b511f6dc4882985cf4b4133
-  add-to-marlin-gitignore: 83dcad520f19d2ea6f1164b9c04e1430b679b3e2
-  refresh-temp: a0ed05092019e8b1bc4d673a1fd163417a533792
+  add-to-marlin-gitignore: 6a0fad50983c4fb5b60173ae96a6eb96ae9d4976
 Unapplied:
   makefile-support-v-1: 3f7781d27a680fa4faeb5d7f38250e4877632ce3
   motion-control-max-min: 44befa5f783994f92f7c6fd39b7f581cf174d9d4
diff --git a/patches/add-to-marlin-gitignore b/patches/add-to-marlin-gitignore
index 0052655..b4a5f9e 100644
--- a/patches/add-to-marlin-gitignore
+++ b/patches/add-to-marlin-gitignore
@@ -1,20 +1,34 @@
 Bottom: ea0dec1cbcd304d9d1750032f70194ceeb751dd6
-Top:    68d4c4e12d84bd72af570706e1383a0fab8cbfaa
+Top:    b7add21b1bd3c563a45013d967bebaa01b5078e9
 Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Date:   2012-08-08 18:32:51 +0100
 
-Add *~ to Marlin/.gitignore
+.gitignore: Add *~, *.orig, *.rej, move to root directory
+
+Move the .gitignore out of the Marlin subdirectory so it applies to
+the whole tree, and add some missing patterns.
 
 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 
 
 ---
 
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000..0a12acf
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1,5 @@
++*.o
++applet/
++*~
++*.orig
++*.rej
 diff --git a/Marlin/.gitignore b/Marlin/.gitignore
-index 37a3c9b..4f6f906 100644
+deleted file mode 100644
+index 37a3c9b..0000000
 --- a/Marlin/.gitignore
-+++ b/Marlin/.gitignore
-@@ -1,2 +1,3 @@
- *.o
- applet/
-+*~
++++ /dev/null
+@@ -1,2 +0,0 @@
+-*.o
+-applet/
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 6a7553d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: 68d4c4e12d84bd72af570706e1383a0fab8cbfaa
-Top:    b7add21b1bd3c563a45013d967bebaa01b5078e9
-Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
-Date:   2012-08-09 19:01:27 +0100
-
-Refresh of add-to-marlin-gitignore
-
----
-
-diff --git a/.gitignore b/.gitignore
-new file mode 100644
-index 0000000..0a12acf
---- /dev/null
-+++ b/.gitignore
-@@ -0,0 +1,5 @@
-+*.o
-+applet/
-+*~
-+*.orig
-+*.rej
-diff --git a/Marlin/.gitignore b/Marlin/.gitignore
-deleted file mode 100644
-index 4f6f906..0000000
---- a/Marlin/.gitignore
-+++ /dev/null
-@@ -1,3 +0,0 @@
--*.o
--applet/
--*~