mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +00:00
95a38461fe
This is the simplest method of preserving the commit history for each file from the salt-cloud repository, although the --follow flag must be given to git log in order to view the full history. This change allows for performing a regular git merge from within the Salt repo without any merge conflicts occuring (since the salt_cloud dir doesn't exist there).
32 lines
516 B
Plaintext
32 lines
516 B
Plaintext
build
|
|
*.py[co]
|
|
pkg/arch/*.tar.xz
|
|
*.swp
|
|
doc/_build
|
|
dist
|
|
MANIFEST
|
|
|
|
# virtualenv
|
|
# - ignores directories of a virtualenv when you create it right on
|
|
# top of salt such as
|
|
# - /some/path$ git clone https://github.com/thatch45/salt.git
|
|
# - /some/path$ virtualenv --python=/usr/bin/python2.6 salt
|
|
bin/
|
|
include/
|
|
lib/
|
|
pip/
|
|
share/
|
|
|
|
# tox - ignore any tox-created virtualenv dirs
|
|
.tox
|
|
|
|
# setuptools stuff
|
|
*.egg-info
|
|
|
|
# code coverage outputs genereated by coverage.py
|
|
.coverage
|
|
coverage.xml
|
|
htmlcov/
|
|
/.project
|
|
/.pydevproject
|