From 9f75591eef3fca1f1fee0c9c94324aadad738194 Mon Sep 17 00:00:00 2001
From: "Hemanth.HM" <hemanth.hm@gmail.com>
Date: Sat, 13 Aug 2016 18:11:04 +0000
Subject: [PATCH] fixes #118

---
 README.md | 2 +-
 tips.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9eb4aed..13a8c4f 100644
--- a/README.md
+++ b/README.md
@@ -683,7 +683,7 @@ git checkout <commit-ish> -- <file_path>
 
 ## Always rebase instead of merge on pull.
 ```sh
-git config --global branch.autosetuprebase always
+git config --global pull.rebase true
 ```
 
 ## List all the alias and configs.
diff --git a/tips.json b/tips.json
index ff32f8c..c01fedf 100644
--- a/tips.json
+++ b/tips.json
@@ -259,7 +259,7 @@
     "tip": "git checkout <commit-ish> -- <file_path>"
 }, {
     "title": "Always rebase instead of merge on pull.",
-    "tip": "git config --global branch.autosetuprebase always"
+    "tip": "git config --global pull.rebase true"
 }, {
     "title": "List all the alias and configs.",
     "tip": "git config --list"