From a6b1aaf8255c18ee63a778fb3b747832e2efe5e6 Mon Sep 17 00:00:00 2001
From: Tyr Chen <tyr.chen@gmail.com>
Date: Sat, 5 Sep 2015 14:03:30 -0700
Subject: [PATCH 1/4] change semi to never and comma-dangle to never

---
 packages/eslint-config-airbnb/base/index.js | 4 ++--
 packages/eslint-config-airbnb/package.json  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/eslint-config-airbnb/base/index.js b/packages/eslint-config-airbnb/base/index.js
index ee578638f0..6194001980 100644
--- a/packages/eslint-config-airbnb/base/index.js
+++ b/packages/eslint-config-airbnb/base/index.js
@@ -50,7 +50,7 @@ module.exports = {
     /**
      * Possible errors
      */
-    'comma-dangle': [2, 'always-multiline'],    // http://eslint.org/docs/rules/comma-dangle
+    'comma-dangle': [2, 'never'],    // http://eslint.org/docs/rules/comma-dangle
     'no-cond-assign': [2, 'always'], // http://eslint.org/docs/rules/no-cond-assign
     'no-console': 1,                 // http://eslint.org/docs/rules/no-console
     'no-debugger': 1,                // http://eslint.org/docs/rules/no-debugger
@@ -156,7 +156,7 @@ module.exports = {
     'no-underscore-dangle': 0,       // http://eslint.org/docs/rules/no-underscore-dangle
     'one-var': [2, 'never'],         // http://eslint.org/docs/rules/one-var
     'padded-blocks': [2, 'never'],   // http://eslint.org/docs/rules/padded-blocks
-    'semi': [2, 'always'],           // http://eslint.org/docs/rules/semi
+    'semi': [2, 'never'],           // http://eslint.org/docs/rules/semi
     'semi-spacing': [2, {            // http://eslint.org/docs/rules/semi-spacing
       'before': false,
       'after': true
diff --git a/packages/eslint-config-airbnb/package.json b/packages/eslint-config-airbnb/package.json
index 050567251f..1f64ce7ba5 100644
--- a/packages/eslint-config-airbnb/package.json
+++ b/packages/eslint-config-airbnb/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "eslint-config-airbnb",
+  "name": "eslint-config-tyrchen",
   "version": "0.0.8",
-  "description": "Airbnb's ESLint config, following our styleguide",
+  "description": "A fork to Airbnb's ESLint config, change comma-dangle to never and semi to never",
   "main": "index.js",
   "scripts": {
     "lint": "./node_modules/.bin/eslint .",

From 2ef464d6879949c9f2675f138b43c2e043a82121 Mon Sep 17 00:00:00 2001
From: Tyr Chen <tyr.chen@gmail.com>
Date: Tue, 6 Oct 2015 15:47:12 -0700
Subject: [PATCH 2/4] fix package.json

---
 packages/eslint-config-airbnb/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/eslint-config-airbnb/package.json b/packages/eslint-config-airbnb/package.json
index 5d89ac6b1e..5516c8caff 100644
--- a/packages/eslint-config-airbnb/package.json
+++ b/packages/eslint-config-airbnb/package.json
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/airbnb/javascript"
+    "url": "https://github.com/tyrchen/javascript"
   },
   "keywords": [
     "eslint",
@@ -19,12 +19,12 @@
     "javascript",
     "styleguide"
   ],
-  "author": "Jake Teton-Landis (https://twitter.com/@jitl)",
+  "author": "Tyr Chen (https://github.com/tyrchen)",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/airbnb/javascript/issues"
+    "url": "https://github.com/tyrchen/javascript/issues"
   },
-  "homepage": "https://github.com/airbnb/javascript",
+  "homepage": "https://github.com/tyrchen/javascript",
   "devDependencies": {
     "babel-eslint": "4.1.3",
     "babel-tape-runner": "1.2.0",

From eb59dbaafc66db1ffe4ed94273c18d7214bda8df Mon Sep 17 00:00:00 2001
From: Tyr Chen <tyr.chen@gmail.com>
Date: Tue, 6 Oct 2015 16:02:23 -0700
Subject: [PATCH 3/4] fix styling issue after merge

---
 packages/eslint-config-airbnb/base.js         |  4 ++--
 packages/eslint-config-airbnb/index.js        |  4 ++--
 packages/eslint-config-airbnb/legacy.js       | 14 +++++++-------
 packages/eslint-config-airbnb/rules/errors.js |  2 +-
 packages/eslint-config-airbnb/rules/style.js  |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/eslint-config-airbnb/base.js b/packages/eslint-config-airbnb/base.js
index ff9904e775..2f2a9e6e62 100644
--- a/packages/eslint-config-airbnb/base.js
+++ b/packages/eslint-config-airbnb/base.js
@@ -1,7 +1,7 @@
 module.exports = {
   'extends': [
-    'eslint-config-airbnb/legacy',
-    'eslint-config-airbnb/rules/es6',
+    'eslint-config-tyrchen/legacy',
+    'eslint-config-tyrchen/rules/es6',
   ],
   'parser': 'babel-eslint',
   'rules': {}
diff --git a/packages/eslint-config-airbnb/index.js b/packages/eslint-config-airbnb/index.js
index 46d601fe3f..0ed935318c 100644
--- a/packages/eslint-config-airbnb/index.js
+++ b/packages/eslint-config-airbnb/index.js
@@ -1,7 +1,7 @@
 module.exports = {
   'extends': [
-    'eslint-config-airbnb/base',
-    'eslint-config-airbnb/rules/react',
+    'eslint-config-tyrchen/base',
+    'eslint-config-tyrchen/rules/react',
   ],
   rules: {}
 };
diff --git a/packages/eslint-config-airbnb/legacy.js b/packages/eslint-config-airbnb/legacy.js
index 83a4931e84..a173a07792 100644
--- a/packages/eslint-config-airbnb/legacy.js
+++ b/packages/eslint-config-airbnb/legacy.js
@@ -1,12 +1,12 @@
 module.exports = {
   'extends': [
-    'eslint-config-airbnb/rules/best-practices',
-    'eslint-config-airbnb/rules/errors',
-    'eslint-config-airbnb/rules/legacy',
-    'eslint-config-airbnb/rules/node',
-    'eslint-config-airbnb/rules/strict',
-    'eslint-config-airbnb/rules/style',
-    'eslint-config-airbnb/rules/variables'
+    'eslint-config-tyrchen/rules/best-practices',
+    'eslint-config-tyrchen/rules/errors',
+    'eslint-config-tyrchen/rules/legacy',
+    'eslint-config-tyrchen/rules/node',
+    'eslint-config-tyrchen/rules/strict',
+    'eslint-config-tyrchen/rules/style',
+    'eslint-config-tyrchen/rules/variables'
   ],
   'env': {
     'browser': true,
diff --git a/packages/eslint-config-airbnb/rules/errors.js b/packages/eslint-config-airbnb/rules/errors.js
index ec1b1aab0e..229cffe16c 100644
--- a/packages/eslint-config-airbnb/rules/errors.js
+++ b/packages/eslint-config-airbnb/rules/errors.js
@@ -1,7 +1,7 @@
 module.exports = {
   'rules': {
     // disallow trailing commas in object literals
-    'comma-dangle': [2, 'always-multiline'],
+    'comma-dangle': [2, 'never'],
     // disallow assignment in conditional expressions
     'no-cond-assign': [2, 'always'],
     // disallow use of console
diff --git a/packages/eslint-config-airbnb/rules/style.js b/packages/eslint-config-airbnb/rules/style.js
index fa22403d8b..71785d30ec 100644
--- a/packages/eslint-config-airbnb/rules/style.js
+++ b/packages/eslint-config-airbnb/rules/style.js
@@ -85,7 +85,7 @@ module.exports = {
     // enforce spacing before and after semicolons
     'semi-spacing': [2, {'before': false, 'after': true}],
     // require or disallow use of semicolons instead of ASI
-    'semi': [2, 'always'],
+    'semi': [2, 'never'],
     // sort variables within the same declaration block
     'sort-vars': 0,
     // require a space after certain keywords

From a8dbe44b8bc6d8c9b436e15fe452672044cd5437 Mon Sep 17 00:00:00 2001
From: Tyr Chen <tyr.chen@gmail.com>
Date: Tue, 6 Oct 2015 16:02:55 -0700
Subject: [PATCH 4/4] bump version

---
 packages/eslint-config-airbnb/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/eslint-config-airbnb/package.json b/packages/eslint-config-airbnb/package.json
index 5516c8caff..1f5c71f576 100644
--- a/packages/eslint-config-airbnb/package.json
+++ b/packages/eslint-config-airbnb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-tyrchen",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "A fork to Airbnb's ESLint config, change comma-dangle to never and semi to never",
   "main": "index.js",
   "scripts": {