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

Merge branch 'master' of https://apu.dw.local/git/Users/JoshHoltrop/files

Browse Source
This commit is contained in:
mZwagerman 2011-06-09 15:51:47 -04:00
commit 3d1803c431
4 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bash_aliases
View File

@ -90,11 +90,23 @@ function git-config-joshs()
git config --global core.excludesfile ${HOME}/.gitignore
git config --global core.pager 'less -FRXi'
git config --global alias.dc 'diff --cached'
git config --global alias.gdiff 'difftool -y -t gvimdiff'
git config --global alias.gdiffc 'difftool -y -t gvimdiff --cached'
if [ -e /bin/cygwin1.dll ]; then
git config --global alias.bcdiff 'difftool -y -t bc2'
git config --global alias.bcdiffc 'difftool -y -t bc2 --cached'
git config --global difftool.bc2.cmd 'git_bc2diff "$LOCAL" "$REMOTE"'
git config --global alias.bcmerge 'mergetool -y -t bc2'
git config --global mergetool.bc2.cmd \
'git_bc2merge "$LOCAL" "$REMOTE" "$MERGED"'
git config --global mergetool.bc2.trustExitCode false
fi
}
alias git-find-lost-commit='git fsck --lost-found'
if [[ "$(which jsvn 2>/dev/null)" != "" ]]; then
alias svn='jsvn'
fi
alias jindent='indent -bbo -bl -blf -bli0 -bls -i4 -npcs -nut -ts8'
# source any machine-local aliases
# this way ~/.bash_aliases can be a symlink to a version-controlled

5
git_bc2diff Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
path1=$(cygpath -w "$1")
path2=$(cygpath -w "$2")
/cygdrive/c/apps/Beyond\ Compare\ 2/BC2.exe "$path1" "$path2" /title1=Base /leftreadonly

6
git_bc2merge Executable file
View File

@ -0,0 +1,6 @@
#!/bin/sh
local=$(cygpath -w "$1")
remote=$(cygpath -w "$2")
merged=$(cygpath -w "$3")
/cygdrive/c/apps/Beyond\ Compare\ 2/BC2.exe "$local" "$remote" /title1=Local /title2=Remote /savetarget="$merged"

2
jsvn
View File

@ -283,7 +283,7 @@ def binaries(argv, svn, base_path = '.'):
ent_path = os.sep.join([base_path, ent])
if os.path.isfile(ent_path):
mime_type = getSVNProperty(svn, 'svn:mime-type', ent_path)
if re.match(r'application/octet-stream', mime_type):
if mime_type != '' and not re.match(r'text/.*', mime_type):
# we found a binary file
needs_lock = getSVNProperty(svn, 'svn:needs-lock', ent_path)
if needs_lock: