From 596717f29eecb821c59efb35a9e8cffb40260f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=A0=E9=87=8C?= <xiaofeng.mxf@taobao.com>
Date: Tue, 9 Sep 2014 10:53:53 +0800
Subject: [PATCH] update doc

---
 README.md    |  4 ----
 filter.sh    | 19 +++++++++++++++++++
 package.json |  6 ++----
 3 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100755 filter.sh

diff --git a/README.md b/README.md
index b24ea6c..79c0ad3 100644
--- a/README.md
+++ b/README.md
@@ -158,11 +158,7 @@ Using https features
 #### step 2 - generate a rootCA and trust it
 * you should do this when it is the first time to start anyproxy
 * execute ``anyproxy --root`` ,follow the instructions on screen
-<<<<<<< HEAD
 * **[important!]you will see some tip like *rootCA generated at : /usr/lib...* . ``cd`` to that directory, add/trust the rootCA.crt file to your system keychain. In OSX, you may do that by open the *crt file directly**
-=======
-* [important!]you will see some tip like *rootCA generated at : /usr/lib...* . ``cd`` to that directory, add/trust the rootCA.crt file to your system keychain. In OSX, you may do that by open the *crt file directly
->>>>>>> 3bd519b16572cb490e7df4956de7de3e06151101
 
 #### step 3 - start a https proxy
 * ``anyproxy --type https --host my.domain.com``
diff --git a/filter.sh b/filter.sh
new file mode 100755
index 0000000..114015c
--- /dev/null
+++ b/filter.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+ 
+git filter-branch -f --env-filter '
+ 
+OLD_EMAIL="5918760@gmail.com"
+CORRECT_NAME="想当当"
+CORRECT_EMAIL="donghua.yan@alipay.com"
+ 
+if [ "$GIT_COMMITTER_EMAIL" = "$OLD_EMAIL" ]
+then
+    export GIT_COMMITTER_NAME="$CORRECT_NAME"
+    export GIT_COMMITTER_EMAIL="$CORRECT_EMAIL"
+fi
+if [ "$GIT_AUTHOR_EMAIL" = "$OLD_EMAIL" ]
+then
+    export GIT_AUTHOR_NAME="$CORRECT_NAME"
+    export GIT_AUTHOR_EMAIL="$CORRECT_EMAIL"
+fi
+' --tag-name-filter cat -- --branches --tags
\ No newline at end of file
diff --git a/package.json b/package.json
index 027404d..86f357a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "anyproxy",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "a charles/fiddler like proxy written in NodeJs, which can handle HTTPS requests and CROS perfectly.",
   "main": "proxy.js",
   "bin": {
@@ -25,9 +25,7 @@
     "test": "nodeunit test.js"
   },
   "repository": {
-    "type": "git",
-    "url": "https://github.com/alipay-ct-wd/anyproxy"
   },
-  "author": "alipay-sh-wd@list.alibaba-inc.com",
+  "author": "ottomao@gmail.com",
   "license": "ISC"
 }