diff --git a/README.md b/README.md index 9eb4aed..13a8c4f 100644 --- a/README.md +++ b/README.md @@ -683,7 +683,7 @@ git checkout -- ## 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 -- " }, { "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"