rerere.enabled

Author: hemanth

README.md

@@ -90,6 +90,7 @@
 * [List ignored files.](https://github.com/git-tips/tips#list-ignored-files)
 * [Status of ignored files.](https://github.com/git-tips/tips#status-of-ignored-files)
 * [Commits in Branch1 that are not in Branch2](https://github.com/git-tips/tips#commits-in-branch1-that-are-not-in-branch2)
+* [reuse recorded resolution, record and reuse previous conflicts resolutions.](https://github.com/git-tips/tips#reuse-recorded-resolution-record-and-reuse-previous-conflicts-resolutions)
 
 <!-- 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 -->
@@ -623,5 +624,10 @@ git status --ignored
 git log Branch1 ^Branch2
 ```
 
+## reuse recorded resolution, record and reuse previous conflicts resolutions.
+```sh
+git config --global rerere.enabled 1
+```
+
 <!-- 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

@@ -275,4 +275,7 @@
 },{
 	"title": "Commits in Branch1 that are not in Branch2",
 	"tip": "git log Branch1 ^Branch2"
+}, {
+	"title": "reuse recorded resolution, record and reuse previous conflicts resolutions.",
+	"tip":"git config --global rerere.enabled 1"
 }]