mirror of
https://github.com/namibia/tips.git
synced 2024-11-14 09:14:06 +00:00
Add alternative for rebase on pulls (git < 1.7.9) (#126)
This commit is contained in:
parent
c42ade5ba4
commit
50bb41326f
@ -686,6 +686,13 @@ git checkout <commit-ish> -- <file_path>
|
||||
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
|
||||
|
@ -258,7 +258,8 @@
|
||||
"tip": "git checkout <commit-ish> -- <file_path>"
|
||||
}, {
|
||||
"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"
|
||||
|
Loading…
Reference in New Issue
Block a user