knowledge/git-tips
1
0
Fork 0
mirror of https://github.com/namibia/tips.git synced 2025-01-05 15:12:18 +00:00
Code Issues Releases Activity

branch.autosetuprebase

Browse Source
This commit is contained in:
Hemanth.HM 2016-01-01 21:12:17 +05:30
parent 7078656d7c
commit 3c31eac721
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -73,6 +73,7 @@
* [Undo assume-unchanged.](https://github.com/git-tips/tips#undo-assume-unchanged) * [Undo assume-unchanged.](https://github.com/git-tips/tips#undo-assume-unchanged)
* [Clean the files from `.gitignore`.](https://github.com/git-tips/tips#clean-the-files-from-gitignore) * [Clean the files from `.gitignore`.](https://github.com/git-tips/tips#clean-the-files-from-gitignore)
* [Restore deleted file.](https://github.com/git-tips/tips#restore-deleted-file) * [Restore deleted file.](https://github.com/git-tips/tips#restore-deleted-file)
* [Always rebase instead of merge on pull.](https://github.com/git-tips/tips#always-rebase-instead-of-merge-on-pull)
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. --> <!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie.inject end toc --> <!-- @doxie.inject end toc -->
@ -509,5 +510,10 @@ git clean -X -f
git checkout <deleting_commit>^ -- <file_path> git checkout <deleting_commit>^ -- <file_path>
``` ```
## Always rebase instead of merge on pull.
```sh
git config --global branch.autosetuprebase always
```
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. --> <!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie.inject end --> <!-- @doxie.inject end -->

4
tips.json
View File

@ -292,5 +292,9 @@
{ {
"title": "Restore deleted file.", "title": "Restore deleted file.",
"tip": "git checkout <deleting_commit>^ -- <file_path>" "tip": "git checkout <deleting_commit>^ -- <file_path>"
},
{
"title": "Always rebase instead of merge on pull.",
"tip": "git config --global branch.autosetuprebase always"
} }
] ]