From b7fc5b10b2787ee84588646a5590de4a43306e98 Mon Sep 17 00:00:00 2001
From: Tom Weininger <tweining@redhat.com>
Date: Sun, 21 Aug 2022 17:02:11 +0200
Subject: [PATCH] Add *.orig to .gitignore

.orig files get generated by Git when a merge conflict happens. Nobody
should ever want to add those files to the Git tree. By including them
in .gitignore we prevent that those files get added by accident.

Change-Id: Ifff0a4a5f78e35ecd722ecdb15edd08347230842
(cherry picked from commit 54a778e8a598e5eca7269305ea1017d55d220fb5)
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index d83eb6f602..e67c85ef2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ tempest.log
 .eggs/
 .ropeproject/
 *.qcow2
+*.orig
 
 # Files created by releasenotes build
 releasenotes/build