From fc1b77104d6ff9c904438a1a03d16cb57928ec78 Mon Sep 17 00:00:00 2001 From: Krzysztof Szumny Date: Mon, 28 Mar 2016 14:34:54 +0200 Subject: [PATCH] git related fixes --- {{cookiecutter.repo_name}}/.gitignore | 12 +++++++++++- .../.idea/runConfigurations/Docker__migrate.xml | 4 ++-- .../runConfigurations/Docker__runserver.xml | 4 ++-- .../Docker__runserver_plus.xml | 4 ++-- {{cookiecutter.repo_name}}/.idea/vcs.xml | 6 ++++++ .../.idea/{{cookiecutter.repo_name}}.iml | 7 ++++++- .../docs/pycharm/configuration.rst | 10 ++++++++++ .../docs/pycharm/images/issue2.png | Bin 0 -> 11625 bytes 8 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 {{cookiecutter.repo_name}}/.idea/vcs.xml create mode 100644 {{cookiecutter.repo_name}}/docs/pycharm/images/issue2.png diff --git a/{{cookiecutter.repo_name}}/.gitignore b/{{cookiecutter.repo_name}}/.gitignore index 4b288b5b..b4f3f5b9 100644 --- a/{{cookiecutter.repo_name}}/.gitignore +++ b/{{cookiecutter.repo_name}}/.gitignore @@ -38,7 +38,17 @@ htmlcov *.pot # Pycharm -.idea +.idea/* +{% if cookiecutter.use_pycharm == 'y' %} +# Provided default Pycharm Run/Debug Configurations should be tracked by git +# In case of local modifications made by Pycharm, use update-index command +# for each changed file, like this: +# git update-index --assume-unchanged .idea/{{cookiecutter.repo_name}}.iml +!.idea/runConfigurations/ +!.idea/{{cookiecutter.repo_name}}.iml +!.idea/vcs.xml +!.idea/webResources.xml +{% endif %} # Vim diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml index 325698d5..6a7b1b06 100644 --- a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml +++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__migrate.xml @@ -3,8 +3,8 @@