Skip to content

Instantly share code, notes, and snippets.

[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\"
[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 April 18, 2017 17:56
ConEmu Setup Config for Git and Chocolatey
  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 March 17, 2017 18:34
Windows 2016 Docker Upgrade to 1.13
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 February 21, 2017 23:02
WinMerge Git Internal Folder Filter
## 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
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
Set-ExecutionPolicy Unrestricted -Force
Import-Module Boxstarter.Chocolatey
Install-BoxstarterPackage -PackageName https://gist.githubusercontent.com/segilbert/100f871a406f568bfd9e72d6aac2970a/raw/29562aaa6a8ff164b0033202e1b27185b043e85f/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
Set-ExecutionPolicy Unrestricted -Force
Import-Module Boxstarter.Chocolatey
Install-BoxstarterPackage -PackageName https://gist.githubusercontent.com/segilbert/8946331a1e8957c37001fbb7ad815a4c/raw/8b36cd391e2cc135db6c01df3ac879d9fdedebf9/DevTestLabCodeGenMachineWin8Setup.txt
@segilbert
segilbert / 0.ReadMe.md
Last active February 12, 2017 04:18
Ever wanted or had the need to create a version of the MS Northwind SQL Server Database on Oracle? If you are working with EntLib code base and want to run the unit tests then you know what I'm taking about. Please see the readMe.md for additional details.

MS Northwind for Oracle

Summary

Ever wanted or had the need to create a version of the MS Northwind SQL Server Database on Oracle? If you are working with EntLib code base and want to run the unit tests then you know what I'm taking about. The scrips below will create Northwind in an Oracle database.

Scripts: ( order required to be run )

  1. northwind.oracle.schema.sql
  2. northwind.oracle.tables.views..sql
  3. northwind.oracle.packages.sql
  4. northwind.oracle.sps.sql