josh/files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add git_gvimdiff wrapper script and "gdiff" git alias

Browse Source
This commit is contained in:
Josh Holtrop 2011-05-31 09:14:18 -04:00
parent b760603b37
commit 53605facf8
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bash_aliases
View File

@ -90,6 +90,7 @@ function git-config-joshs()
git config --global core.excludesfile ${HOME}/.gitignore git config --global core.excludesfile ${HOME}/.gitignore
git config --global core.pager 'less -FRXi' git config --global core.pager 'less -FRXi'
git config --global alias.dc 'diff --cached' git config --global alias.dc 'diff --cached'
git config --global alias.gdiff '!f() { GIT_EXTERNAL_DIFF=git_gvimdiff git --no-pager diff $1; }; f'
} }
alias git-find-lost-commit='git fsck --lost-found' alias git-find-lost-commit='git fsck --lost-found'
if [[ "$(which jsvn 2>/dev/null)" != "" ]]; then if [[ "$(which jsvn 2>/dev/null)" != "" ]]; then

5
git_gvimdiff Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
gvimdiff "$2" "$5"
# give gvimdiff a chance to read the file before exiting
sleep 1