Skip to content

Commit 9f75591

Browse files
committed
fixes #118
1 parent 81040e9 commit 9f75591

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ git checkout <commit-ish> -- <file_path>
683683

684684
## Always rebase instead of merge on pull.
685685
```sh
686-
git config --global branch.autosetuprebase always
686+
git config --global pull.rebase true
687687
```
688688

689689
## List all the alias and configs.

tips.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
"tip": "git checkout <commit-ish> -- <file_path>"
260260
}, {
261261
"title": "Always rebase instead of merge on pull.",
262-
"tip": "git config --global branch.autosetuprebase always"
262+
"tip": "git config --global pull.rebase true"
263263
}, {
264264
"title": "List all the alias and configs.",
265265
"tip": "git config --list"

0 commit comments

Comments
 (0)