Craig P. Motlin motlin

## CmderZSH.md

      
              1 file
            
          
              26 forks
            
          
              15 comments
            
          
              184 stars
            
          
                dfontana
                / CmderZSH.md
            
            
              Last active
              March 12, 2023 21:45
            
              
                My setup guide for installing Cgywin, Mintty, Cmder, and ZSH.
              
          
    What's this?

Instructions to obtain ZSH on a windows environment, without the input funny business presented by some other attempted solutions.
The final result is ZSH running on a mintty terminal, emulated by cygwin, and being handled by the popular cmder.
Why is this here?

For the benefit of myself and others. I've already followed these instructions twice. It took me hours to figure all this out, maybe someone else can save a few.
What exactly is covered?


Installing and setting up cmder


## gitconfig.md

      
              1 file
            
          
              7 forks
            
          
              7 comments
            
          
              37 stars
            
          
                ffittschen
                / gitconfig.md
            
            
              Last active
              July 17, 2024 13:46
            
              
                Use IntelliJ or WebStorm as git mergetool with SourceTree
              
          
    Use IntelliJ or WebStorm as git mergetool

Configure Sourcetree

The merge tool that ships with JetBrain's IntelliJ IDEA or WebStorm is really awesome and way better than FileMerge. It is quite simple to configure SourceTree to use it as the default mergetool:

Open the SourceTree preferences and select the Diff tab
Choose Custom both as Visual Diff Tool and as Merge Tool
Paste the following commands into the textfields:


Diff Command: /Applications/IntelliJ\ IDEA.app/Contents/MacOS/idea diff


## pr.md

      
              1 file
            
          
              506 forks
            
          
              158 comments
            
          
              3665 stars
            
          
                piscisaureus
                / pr.md
            
            
              Created
              August 13, 2012 16:12
            
              
                Checkout github pull requests locally
              
          
    Locate the section for your github remote in the .git/config file. It looks like this:
[remote "origin"]
	fetch = +refs/heads/*:refs/remotes/origin/*
	url = git@github.com:joyent/node.git

Now add the line fetch = +refs/pull/*/head:refs/remotes/origin/pr/* to this section. Obviously, change the github url to match your project's URL. It ends up looking like this: