Wednesday, July 6, 2016

TIP: "git unmerged" to list unmerged files with conflicts

in your ~/.gitconfig file:

[alias]
        unmerged = diff --name-only --diff-filter=U

1 comment:

  1. iDealshare VideoGo is just the right AVI to Roku Converter which has both Mac and Windows version! It helps to convert various AVI files whatever encoded with DivX, Xvid, etc to Roku more supported MP4 or MKV. https://www.idealshare.net/video-converter/roku-avi.html

    ReplyDelete