branch.autosetuprebase

Author: hemanth

README.md

@@ -73,6 +73,7 @@
 * [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)
 * [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>. -->
 <!-- @doxie.inject end toc -->
@@ -509,5 +510,10 @@ git clean -X -f
 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>. -->
 <!-- @doxie.inject end -->

tips.json

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