summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJess VanDerwalker <washu@sonic.net>2012-04-04 15:24:06 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2012-04-05 11:55:11 -0700
commit9bd6cfc3e9316c8545f465d416031369d278ebf8 (patch)
tree3a172913c735acfe75f0120cc944f1b27c9f69b4
parent7f68ff27ad1b7f60a3a072950cfd7d09d0977f52 (diff)
*.orig and *.patch files added to gitignore
Signed-off-by: Jess VanDerwalker <washu@sonic.net>
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5925934..07b76b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,7 @@ autom4te.cache
config.sub
depcomp
missing
+
+# Merge and patch files to ignore
+*.orig
+*.patch \ No newline at end of file