From: Emil Velikov <emil.velikov@collabora.com>
Date: Wed, 30 Aug 2017 15:29:59 +0000 (+0100)
Subject: .gitignore: list *.orig and *.rej
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=368734d014510aa82403a8064c5f57a76d0ba406;p=mesa.git

.gitignore: list *.orig and *.rej

Should prevent accidental check-in of patch artefacts.

Suggested-by: Mike Lothian <mike@fireburn.co.uk>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---

diff --git a/.gitignore b/.gitignore
index 964409265fa..b79828c9a9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,11 +7,13 @@
 *.log
 *.o
 *.obj
+*.orig
 *.os
 *.pc
 *.pdb
 *.pyc
 *.pyo
+*.rej
 *.so
 *.so.*
 *.sw[a-z]