summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2014-08-18 19:48:27 +0200
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2014-08-18 19:48:27 +0200
commite5e3fcaf791801103e325ec54e7ca0fa00d08a50 (patch)
treeefae701de6977e16697218370159d95bffaa4cfb
parente76b1ffde930dd03d3eeed40eedc3dc12fad634f (diff)
parent9e4a9935c23ed8c501207ea108cf0b7b86d9bd58 (diff)
downloadgitlab-ce-e5e3fcaf791801103e325ec54e7ca0fa00d08a50.tar.gz
Merge pull request #7438 from bbodenmiller/patch-5
Add dealing with newlines for editor to 5.1-to-6.0
-rw-r--r--doc/update/5.1-to-6.0.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/update/5.1-to-6.0.md b/doc/update/5.1-to-6.0.md
index 123b3326ead..36a9570eeaa 100644
--- a/doc/update/5.1-to-6.0.md
+++ b/doc/update/5.1-to-6.0.md
@@ -89,6 +89,9 @@ sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production
# Clear and precompile assets
sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production
sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
+
+#Add dealing with newlines for editor
+sudo -u git -H git config --global core.autocrlf input
```
## 6. Update config files