rik/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Kaleidoscope configuration

Browse Source 
Kaleidoscope is a diff tool. Add configuration for it and a shortcut to
run it `git dkal`
This commit is contained in:
Nick Nisi
2015-01-12 11:15:11 -06:00
parent b13cd30163
commit e8220bab1b
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
git/gitconfig.symlink
View File

@@ -74,6 +74,9 @@
aa = !git ls-files -d | xargs git rm && git ls-files -m -o --exclude-standard | xargs git add aa = !git ls-files -d | xargs git rm && git ls-files -m -o --exclude-standard | xargs git add
# remove grep - Remove found files that are NOT under version control # remove grep - Remove found files that are NOT under version control
rg = "!sh -c 'git ls-files --others --exclude-standard | grep $1 | xargs rm' -" rg = "!sh -c 'git ls-files --others --exclude-standard | grep $1 | xargs rm' -"
# Kaleidoscope commands
dkal = difftool -y -t Kaleidoscope
[color] [color]
diff = auto diff = auto
status = auto status = auto
@@ -122,3 +125,8 @@
lineNumber = true lineNumber = true
[credential] [credential]
helper = osxkeychain helper = osxkeychain
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true