Fast on Linux and Windows, and supports 3-way merging! Diffinity and Meld are a couple of other viable options.
winget install KDE.KDiff3| {"lastUpload":"2017-07-13T18:06:50.116Z","extensionVersion":"v2.8.2"} |
| $ScriptBlock = | |
| { | |
| Param([int]$RunNumber) | |
| $filename = Join-Path ([IO.Path]::GetTempPath()) "powershell-$RunNumber.doc" | |
| 'Opening Word ...' | |
| $oWord = New-Object -Com Word.Application | |
| $oWord.Visible = $true |
| # .\Get-Signatures.ps1 | Export-Csv -Path output.csv -NoTypeInformation | |
| function Split-X500 { | |
| Param([string]$X500) | |
| $dict = @{} | |
| $X500 -split ', ' | ForEach-Object { | |
| $item = $_.Split('=') | |
| $dict[$item[0]] = $item[1] | |
| } |
Fast on Linux and Windows, and supports 3-way merging! Diffinity and Meld are a couple of other viable options.
winget install KDE.KDiff3| & "$env:LocalAppData\Programs\Microsoft VS Code\bin\code.cmd" --new-window $(git diff --name-only --diff-filter=d HEAD | ForEach-Object { Join-Path (git rev-parse --show-toplevel) $_ }) |
| # https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797 | |
| function Write-Bold() { | |
| param([Parameter(Mandatory)][string]$Message) | |
| $ESC = [char]27 | |
| "$ESC[1m$Message$ESC[0m" | |
| } | |
| #pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") | |
| #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers | |
| #include <SDKDDKVer.h> | |
| #include <windows.h> | |
| #include "resource.h" | |
| INT_PTR CALLBACK AboutProc( | |
| HWND hDlg, | |
| UINT message, |
| git.exe stash store -m ('WIP on {0}: {1}' -f (git.exe rev-parse --abbrev-ref HEAD), (git.exe log -1 --pretty=format:'%h %s')) (git.exe stash create) | |
| git.exe stash show 0 |