knowledge
/
git-tips
mirror of https://github.com/namibia/tips.git
1
0
Fork 0
Code Issues Releases Activity

open conflicted files

This commit is contained in:
Hemanth.HM 2016-03-11 19:28:15 +05:30
parent 1ca386656a
commit def56a7e7b
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -91,6 +91,7 @@
* [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)
* [Open all conflicted files in an editor.](https://github.com/git-tips/tips#open-all-conflicted-files-in-an-editor)
<!-- 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 -->
@ -629,5 +630,10 @@ git log Branch1 ^Branch2
git config --global rerere.enabled 1
```
## Open all conflicted files in an editor.
```sh
git diff --name-only | uniq | xargs $EDITOR
```
<!-- Don’t remove or change the comment below – that can break automatic updates. More info at <http://npm.im/doxie.inject>. -->
<!-- @doxie.inject end -->

3
tips.json
View File

@ -278,4 +278,7 @@
}, {
"title": "reuse recorded resolution, record and reuse previous conflicts resolutions.",
"tip":"git config --global rerere.enabled 1"
},{
"title": "Open all conflicted files in an editor.",
"tip": "git diff --name-only | uniq | xargs $EDITOR"
}]