summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMarc Koderer <marc@koderer.com>2015-08-28 09:05:05 +0200
committerMarc Koderer <marc@koderer.com>2015-08-28 12:48:36 +0000
commitd47b573d9582d9ed974986afef212da716942f45 (patch)
tree6e8e3cdb3fce92024a08c25340a237fc50f4fe31 /.gitignore
parent5871b4709328e3c1e1997b04b91929a345fff305 (diff)
Ignore git backup merge files
*.orig can be ignored since they are git backup merge files. Change-Id: I136f7ee27173360660d10ad572b8058119bf6ef0
Notes
Notes (review): Verified+2: Jenkins Code-Review+1: Takashi NATSUME <natsume.takashi@lab.ntt.co.jp> Code-Review+2: Valeriy Ponomaryov <vponomaryov@mirantis.com> Code-Review+2: Clinton Knight <cknight@netapp.com> Workflow+1: Clinton Knight <cknight@netapp.com> Code-Review+2: Igor Malinovskiy <imalinovskiy@mirantis.com> Code-Review+1: Tiago Pasqualini da Silva <tiago.pasqualini@gmail.com> Submitted-by: Jenkins Submitted-at: Fri, 11 Sep 2015 03:10:03 +0000 Reviewed-on: https://review.openstack.org/218123 Project: openstack/manila Branch: refs/heads/master
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index c7029f7..7a2a5b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
1*.DS_Store 1*.DS_Store
2*.orig
2*.log 3*.log
3*.mo 4*.mo
4*.pyc 5*.pyc