knowledge/git-tips
1
0
Fork 0
mirror of https://github.com/namibia/tips.git synced 2024-06-12 07:02:37 +00:00
Code Issues Releases Activity

Add alternative for rebase on pulls (git < 1.7.9) (#126)

Browse Source
This commit is contained in:
Ankur Kumar 2016-10-05 15:48:35 +05:30 committed by hemanth.hm
parent c42ade5ba4
commit 50bb41326f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -686,6 +686,13 @@ git checkout <commit-ish> -- <file_path>
git config --global pull.rebase true git config --global pull.rebase true
``` ```
__Alternatives:__
```sh
#git < 1.7.9
git config --global branch.autosetuprebase always
```
## List all the alias and configs. ## List all the alias and configs.
```sh ```sh
git config --list git config --list

3
tips.json
View File

@ -258,7 +258,8 @@
"tip": "git checkout <commit-ish> -- <file_path>" "tip": "git checkout <commit-ish> -- <file_path>"
}, { }, {
"title": "Always rebase instead of merge on pull.", "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.", "title": "List all the alias and configs.",
"tip": "git config --list" "tip": "git config --list"