Skip to content

Instantly share code, notes, and snippets.

View semanticmerge.gitconfig
[diff]
tool = semanticmerge
[difftool "semanticmerge"]
cmd = \"C:\\Users\\User\\AppData\\Local\\semanticmerge\\semanticmergetool.exe\" -s \"$LOCAL\" -d \"$REMOTE\"
[difftool]
prompt = false
[merge]
tool = semanticmerge
[mergetool "semanticmerge"]
cmd = \"C:\\Users\\User\\AppData\\Local\\semanticmerge\\semanticmergetool.exe\" -s \"$LOCAL\" -d \"$REMOTE\" -b \"$BASE\" -r \"$MERGED\"
View vsDiffMerge.gitconfig
[diff]
tool = vsdiffmerge
[difftool]
prompt = false
[difftool "vsdiffmerge"]
cmd = '"C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe"' "$LOCAL" "$REMOTE" //t
keepbackup = false
trustexitcode = true
[merge]
tool = vsdiffmerge
@segilbert
segilbert / conemu.md
Last active Apr 18, 2017
ConEmu Setup Config for Git and Chocolatey
View conemu.md
  1. Open Conemu

  2. Open Settings -> Tasks or go to new tab button -> Setup tasks.

  3. Click + to add a new task

  4. Enter the name as Bash::Git bash or whatever you like

  5. Task parameters:

      /icon "C:\Program Files\Git\mingw64\share\git\git-for-windows.ico" /dir "C:\data\work\git"
    
  6. Command:

@segilbert
segilbert / docker-upgrade-windows.ps1
Created Mar 17, 2017
Windows 2016 Docker Upgrade to 1.13
View docker-upgrade-windows.ps1
Stop-Service Docker
Remove-Item (Join-Path -Path $Env:ProgramData -ChildPath "docker") -Recurse -Force
Invoke-WebRequest https://get.docker.com/builds/Windows/x86_64/docker-1.13.0.zip -UseBasicParsing -OutFile docker.zip
Expand-Archive docker.zip -DestinationPath $Env:ProgramFiles -Force
Remove-Item -Force docker.zip
Start-Service Docker
@segilbert
segilbert / Git.flt
Created Feb 21, 2017
WinMerge Git Internal Folder Filter
View Git.flt
## This is a directory/file filter template for WinMerge
name: Git Folder
desc: Filter out all Git Folder (.git) diffs
## Select if filter is inclusive or exclusive
## Inclusive (loose) filter lets through all items not matching rules
## Exclusive filter lets through only items that match to rule
## include or exclude
def: include
View DevTestLabCodeGenMachineWin10Setup.txt
Update-ExecutionPolicy Unrestricted
Set-ExplorerOptions -showHidenFilesFoldersDrives -showProtectedOSFiles -showFileExtensions
Set-TaskbarSmall
Enable-RemoteDesktop
cinst windows-sdk-10.0
cinst visualstudio2013professional
cinst visualstudio2013-sdk
cinst git.install
cinst Boxstarter
View DevTestLabWin10VS2013.ps1
Set-ExecutionPolicy Unrestricted -Force
Import-Module Boxstarter.Chocolatey
Install-BoxstarterPackage -PackageName https://gist.githubusercontent.com/segilbert/100f871a406f568bfd9e72d6aac2970a/raw/29562aaa6a8ff164b0033202e1b27185b043e85f/DevTestLabCodeGenMachineWin10Setup.txt
View DevTestLabVS2013.ps1
Set-ExecutionPolicy Unrestricted -Force
Import-Module Boxstarter.Chocolatey
Install-BoxstarterPackage -PackageName https://gist.githubusercontent.com/segilbert/8946331a1e8957c37001fbb7ad815a4c/raw/8b36cd391e2cc135db6c01df3ac879d9fdedebf9/DevTestLabCodeGenMachineWin8Setup.txt
View DevTestLabCodeGenMachineWin8Setup.txt
Update-ExecutionPolicy Unrestricted
Set-ExplorerOptions -showHidenFilesFoldersDrives -showProtectedOSFiles -showFileExtensions
Set-TaskbarSmall
Enable-RemoteDesktop
cinst windows-sdk-8.1
cinst visualstudio2013professional
cinst visualstudio2013-sdk
cinst git.install
cinst Boxstarter
@segilbert
segilbert / move.directories.cmd
Created Jul 30, 2015
Driver script, using move.directory.cmd command to deep copy a folder from C:\ to D:\, delete the folder once copied and create a sysmlink.
View move.directories.cmd
REM
REM ** USE AT YOUR OWN RISK **
REM
REM Uses move.directory.cmd command to deep copy a folder from C:\ to D:\
REM delete the folder once copied and create a sysmlink.
REM Simply pass in the folder to move.
REM
REM Visual Studio uses "\ProgramData\Package Cache" to store installed
REM packages. These packages are required for VS to uninstall packages