JunielKatarn
/ mergeswm.ps1
Last active
May 4, 2023 08:53
Correct way to merge SWM files into a WIM file. TechNet documentation is wrong for this command.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # Taken from https://technet.microsoft.com/en-us/library/hh825258.aspx | |
| Param | |
| ( | |
| $ImageName | |
| ) | |
| dism /Export-Image ` | |
| /SourceImageFile:${ImageName}.swm ` | |
| /SWMFile:${ImageName}*.swm ` | |
| /SourceIndex:1 ` |
JunielKatarn
/ vsDiffMerge.gitconfig
Last active
March 29, 2024 00:03
Git config to use vsdiffmerge.exe as a diff/merge tool
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # PLEASE SEE FEEDBACK. This script is not up to date and may not use the best practices. | |
| [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 |
OlderNewer