File tree Expand file tree Collapse file tree 2 files changed +9
-1
lines changed Expand file tree Collapse file tree 2 files changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -686,6 +686,13 @@ git checkout <commit-ish> -- <file_path>
686686git 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
691698git config --list
Original file line number Diff line number Diff line change 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\n git config --global branch.autosetuprebase always" ]
262263}, {
263264 "title" : " List all the alias and configs." ,
264265 "tip" : " git config --list"
You can’t perform that action at this time.
0 commit comments