Skip to content

Commit 50bb413

Browse files
ankurk91hemanth
authored andcommitted
Add alternative for rebase on pulls (git < 1.7.9) (#126)
1 parent c42ade5 commit 50bb413

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,13 @@ git checkout <commit-ish> -- <file_path>
686686
git config --global pull.rebase true
687687
```
688688

689+
690+
__Alternatives:__
691+
```sh
692+
#git < 1.7.9
693+
git config --global branch.autosetuprebase always
694+
```
695+
689696
## List all the alias and configs.
690697
```sh
691698
git config --list

tips.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,8 @@
258258
"tip": "git checkout <commit-ish> -- <file_path>"
259259
}, {
260260
"title": "Always rebase instead of merge on pull.",
261-
"tip": "git config --global pull.rebase true"
261+
"tip": "git config --global pull.rebase true",
262+
"alternatives" : ["#git < 1.7.9\ngit config --global branch.autosetuprebase always"]
262263
}, {
263264
"title": "List all the alias and configs.",
264265
"tip": "git config --list"

0 commit comments

Comments
 (0)