diff --git a/README.md b/README.md index 4443396..ce3d857 100644 --- a/README.md +++ b/README.md @@ -686,6 +686,13 @@ git checkout -- git config --global pull.rebase true ``` + +__Alternatives:__ +```sh +#git < 1.7.9 +git config --global branch.autosetuprebase always +``` + ## List all the alias and configs. ```sh git config --list diff --git a/tips.json b/tips.json index dca6643..4bc19e9 100644 --- a/tips.json +++ b/tips.json @@ -258,7 +258,8 @@ "tip": "git checkout -- " }, { "title": "Always rebase instead of merge on pull.", - "tip": "git config --global pull.rebase true" + "tip": "git config --global pull.rebase true", + "alternatives" : ["#git < 1.7.9\ngit config --global branch.autosetuprebase always"] }, { "title": "List all the alias and configs.", "tip": "git config --list"