From df0d46a56e47b88c1148d2fb6c327f7bef17852f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=98=A5=E5=A5=95?= <373852389@qq.com>
Date: Sun, 9 Oct 2016 11:22:35 +0800
Subject: [PATCH] add the merge_upstream bash script

---
 merge_upstream.sh | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 merge_upstream.sh

diff --git a/merge_upstream.sh b/merge_upstream.sh
new file mode 100644
index 00000000..7c3b4390
--- /dev/null
+++ b/merge_upstream.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+git fetch upstream && git merge upstream/master